diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/DatasheetService.java b/diylc/diylc-core/src/main/java/org/diylc/presenter/DatasheetService.java
index abff8506..7dc1812e 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/presenter/DatasheetService.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/presenter/DatasheetService.java
@@ -17,10 +17,7 @@
  */
 package org.diylc.presenter;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
@@ -55,16 +52,15 @@ public class DatasheetService {
   private DatasheetService() {}
 
   public List<String[]> loadDatasheet(Class<?> clazz) {
-    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
     return datasheetCache.computeIfAbsent(clazz.getCanonicalName(), key -> {
       String fileName = clazz.getSimpleName() + ".datasheet";
       LOG.info("Loading datasheet file for " + fileName);
-      URL resource = classloader.getResource(fileName);
-      if (resource == null) {
+      InputStream inputStream = clazz.getResourceAsStream("/datasheets/"  + fileName);
+      if (inputStream == null) {
         LOG.warn("Datasheet file not found: " + fileName);
         return null;
       }
-      try (BufferedInputStream in = new BufferedInputStream(resource.openStream())) {
+      try (BufferedInputStream in = new BufferedInputStream(inputStream)) {
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
 
           List<String[]> types =
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
index b8d5b180..74b4774c 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
@@ -285,7 +285,8 @@ public class Freeway3x3_03 extends AbstractTransparentComponent<Void> implements
     if (svgDiagram == null) {
       try {
         byte[] data =
-            IOUtils.toByteArray(Freeway3x3_03.class.getResourceAsStream("/freeway_3x3-03.svg"));
+            IOUtils.toByteArray(Freeway3x3_03.class.getResourceAsStream(
+                "/component-drawings/freeway_3x3-03.svg"));
         ByteArrayInputStream bis = new ByteArrayInputStream(data);
         SVGUniverse universe = new SVGUniverse();
         URI url = universe.loadSVG(bis,
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java b/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
index 1e67dd13..2527a4cc 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
@@ -40,7 +40,6 @@ import org.diylc.awt.ImageUtils;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
 import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.components.boards.AbstractBoard;
 import org.diylc.components.transform.ImageTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -72,7 +71,7 @@ public class Image extends AbstractTransparentComponent<Void> {
   private Orientation orientation;
 
   static {
-    String name = "/image.png";
+    String name = "/diylc-library-images/image.png";
       try (InputStream inputStream = Image.class.getResourceAsStream(name)) {
           if (inputStream != null) {
             ICON = new ImageIcon(inputStream.readAllBytes(), name);
@@ -99,7 +98,7 @@ public class Image extends AbstractTransparentComponent<Void> {
 
   public Image() {
     try {
-      data = IOUtils.toByteArray(Image.class.getResourceAsStream("/image.png"));
+      data = IOUtils.toByteArray(Image.class.getResourceAsStream("/diylc-library-images/image.png"));
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java b/diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java
index 91610df6..739d16f0 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/misc/SVGImage.java
@@ -81,7 +81,8 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
 
   public SVGImage() {
     try {
-      data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream("/diylc.svg"));
+      data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream(
+          "/diylc-library-images/diylc.svg"));
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/diylc/diylc-library/src/main/resources/freeway_3x3-03.svg b/diylc/diylc-library/src/main/resources/component-drawings/freeway_3x3-03.svg
similarity index 100%
rename from diylc/diylc-library/src/main/resources/freeway_3x3-03.svg
rename to diylc/diylc-library/src/main/resources/component-drawings/freeway_3x3-03.svg
diff --git a/diylc/diylc-library/src/main/resources/AxialElectrolyticCapacitor.datasheet b/diylc/diylc-library/src/main/resources/datasheets/AxialElectrolyticCapacitor.datasheet
similarity index 100%
rename from diylc/diylc-library/src/main/resources/AxialElectrolyticCapacitor.datasheet
rename to diylc/diylc-library/src/main/resources/datasheets/AxialElectrolyticCapacitor.datasheet
diff --git a/diylc/diylc-library/src/main/resources/AxialFilmCapacitor.datasheet b/diylc/diylc-library/src/main/resources/datasheets/AxialFilmCapacitor.datasheet
similarity index 100%
rename from diylc/diylc-library/src/main/resources/AxialFilmCapacitor.datasheet
rename to diylc/diylc-library/src/main/resources/datasheets/AxialFilmCapacitor.datasheet
diff --git a/diylc/diylc-library/src/main/resources/RadialElectrolytic.datasheet b/diylc/diylc-library/src/main/resources/datasheets/RadialElectrolytic.datasheet
similarity index 100%
rename from diylc/diylc-library/src/main/resources/RadialElectrolytic.datasheet
rename to diylc/diylc-library/src/main/resources/datasheets/RadialElectrolytic.datasheet
diff --git a/diylc/diylc-library/src/main/resources/RadialFilmCapacitor.datasheet b/diylc/diylc-library/src/main/resources/datasheets/RadialFilmCapacitor.datasheet
similarity index 100%
rename from diylc/diylc-library/src/main/resources/RadialFilmCapacitor.datasheet
rename to diylc/diylc-library/src/main/resources/datasheets/RadialFilmCapacitor.datasheet
diff --git a/diylc/diylc-library/src/main/resources/RadialMicaCapacitor.datasheet b/diylc/diylc-library/src/main/resources/datasheets/RadialMicaCapacitor.datasheet
similarity index 100%
rename from diylc/diylc-library/src/main/resources/RadialMicaCapacitor.datasheet
rename to diylc/diylc-library/src/main/resources/datasheets/RadialMicaCapacitor.datasheet
diff --git a/diylc/diylc-library/src/main/resources/diylc.svg b/diylc/diylc-library/src/main/resources/diylc-library-images/diylc.svg
similarity index 100%
rename from diylc/diylc-library/src/main/resources/diylc.svg
rename to diylc/diylc-library/src/main/resources/diylc-library-images/diylc.svg
diff --git a/diylc/diylc-library/src/main/resources/image.png b/diylc/diylc-library/src/main/resources/diylc-library-images/image.png
similarity index 100%
rename from diylc/diylc-library/src/main/resources/image.png
rename to diylc/diylc-library/src/main/resources/diylc-library-images/image.png