diff --git a/diylc/diylc-core/pom.xml b/diylc/diylc-core/pom.xml
index 7efa54e0..dea8719d 100644
--- a/diylc/diylc-core/pom.xml
+++ b/diylc/diylc-core/pom.xml
@@ -80,32 +80,4 @@
             <version>1.0</version>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <!-- Maven-Ant integration -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>ant-build</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Call your existing Ant build file -->
-                                <ant antfile="${basedir}/build.xml" target="jar">
-                                    <!-- Pass Maven properties to Ant if needed -->
-                                    <property name="version" value="${project.version}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/IconLoader.java b/diylc/diylc-core/src/main/java/org/diylc/core/images/IconLoader.java
index 38d8d07f..d0f0288c 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/core/images/IconLoader.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/core/images/IconLoader.java
@@ -21,6 +21,8 @@
 */
 package org.diylc.core.images;
 
+import org.apache.log4j.Logger;
+
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -57,11 +59,11 @@ public enum IconLoader {
   }
 
   public Icon getIcon() {
-    java.net.URL imgURL = getClass().getResource(name);
+    java.net.URL imgURL = getClass().getResource("/images/" + name);
     if (imgURL != null) {
       return new ImageIcon(imgURL, name);
     } else {
-      System.err.println("Couldn't find file: " + name);
+      Logger.getLogger(IconLoader.class).error("Couldn't find file: " + name);
       return null;
     }
   }
@@ -69,9 +71,9 @@ public enum IconLoader {
   public Image getImage() {
     BufferedImage img = null;
     try {
-      img = ImageIO.read(getClass().getResourceAsStream(name));
+      img = ImageIO.read(getClass().getResourceAsStream("/images/" + name));
     } catch (IOException e) {
-      System.err.println("Couldn't find file: " + name);
+      Logger.getLogger(IconLoader.class).error("Couldn't find file: " + name);
     }
     return img;
   }
diff --git a/diylc/diylc-core/src/main/java/org/diylc/presenter/blocks.xml b/diylc/diylc-core/src/main/resources/blocks.xml
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/presenter/blocks.xml
rename to diylc/diylc-core/src/main/resources/blocks.xml
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/about.png b/diylc/diylc-core/src/main/resources/images/about.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/about.png
rename to diylc/diylc-core/src/main/resources/images/about.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/add.png b/diylc/diylc-core/src/main/resources/images/add.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/add.png
rename to diylc/diylc-core/src/main/resources/images/add.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_down_blue.png b/diylc/diylc-core/src/main/resources/images/arrow_down_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_down_blue.png
rename to diylc/diylc-core/src/main/resources/images/arrow_down_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_left_blue.png b/diylc/diylc-core/src/main/resources/images/arrow_left_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_left_blue.png
rename to diylc/diylc-core/src/main/resources/images/arrow_left_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_right_blue.png b/diylc/diylc-core/src/main/resources/images/arrow_right_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_right_blue.png
rename to diylc/diylc-core/src/main/resources/images/arrow_right_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_up_blue.png b/diylc/diylc-core/src/main/resources/images/arrow_up_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/arrow_up_blue.png
rename to diylc/diylc-core/src/main/resources/images/arrow_up_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/at.png b/diylc/diylc-core/src/main/resources/images/at.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/at.png
rename to diylc/diylc-core/src/main/resources/images/at.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/back.png b/diylc/diylc-core/src/main/resources/images/back.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/back.png
rename to diylc/diylc-core/src/main/resources/images/back.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/blackboard.png b/diylc/diylc-core/src/main/resources/images/blackboard.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/blackboard.png
rename to diylc/diylc-core/src/main/resources/images/blackboard.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/bom.png b/diylc/diylc-core/src/main/resources/images/bom.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/bom.png
rename to diylc/diylc-core/src/main/resources/images/bom.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/bug.png b/diylc/diylc-core/src/main/resources/images/bug.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/bug.png
rename to diylc/diylc-core/src/main/resources/images/bug.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/check.png b/diylc/diylc-core/src/main/resources/images/check.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/check.png
rename to diylc/diylc-core/src/main/resources/images/check.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/chest.png b/diylc/diylc-core/src/main/resources/images/chest.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/chest.png
rename to diylc/diylc-core/src/main/resources/images/chest.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/component.png b/diylc/diylc-core/src/main/resources/images/component.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/component.png
rename to diylc/diylc-core/src/main/resources/images/component.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/copy.png b/diylc/diylc-core/src/main/resources/images/copy.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/copy.png
rename to diylc/diylc-core/src/main/resources/images/copy.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/csv.png b/diylc/diylc-core/src/main/resources/images/csv.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/csv.png
rename to diylc/diylc-core/src/main/resources/images/csv.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/cut.png b/diylc/diylc-core/src/main/resources/images/cut.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/cut.png
rename to diylc/diylc-core/src/main/resources/images/cut.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/delete.png b/diylc/diylc-core/src/main/resources/images/delete.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/delete.png
rename to diylc/diylc-core/src/main/resources/images/delete.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/disk_blue.png b/diylc/diylc-core/src/main/resources/images/disk_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/disk_blue.png
rename to diylc/diylc-core/src/main/resources/images/disk_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/disks.png b/diylc/diylc-core/src/main/resources/images/disks.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/disks.png
rename to diylc/diylc-core/src/main/resources/images/disks.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/document.png b/diylc/diylc-core/src/main/resources/images/document.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/document.png
rename to diylc/diylc-core/src/main/resources/images/document.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/document_edit.png b/diylc/diylc-core/src/main/resources/images/document_edit.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/document_edit.png
rename to diylc/diylc-core/src/main/resources/images/document_edit.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/document_info.png b/diylc/diylc-core/src/main/resources/images/document_info.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/document_info.png
rename to diylc/diylc-core/src/main/resources/images/document_info.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/document_plain_yellow.png b/diylc/diylc-core/src/main/resources/images/document_plain_yellow.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/document_plain_yellow.png
rename to diylc/diylc-core/src/main/resources/images/document_plain_yellow.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/donate.gif b/diylc/diylc-core/src/main/resources/images/donate.gif
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/donate.gif
rename to diylc/diylc-core/src/main/resources/images/donate.gif
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/donate.png b/diylc/diylc-core/src/main/resources/images/donate.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/donate.png
rename to diylc/diylc-core/src/main/resources/images/donate.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/edit.png b/diylc/diylc-core/src/main/resources/images/edit.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/edit.png
rename to diylc/diylc-core/src/main/resources/images/edit.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/edit_component.png b/diylc/diylc-core/src/main/resources/images/edit_component.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/edit_component.png
rename to diylc/diylc-core/src/main/resources/images/edit_component.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/elements_selection.png b/diylc/diylc-core/src/main/resources/images/elements_selection.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/elements_selection.png
rename to diylc/diylc-core/src/main/resources/images/elements_selection.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/error.png b/diylc/diylc-core/src/main/resources/images/error.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/error.png
rename to diylc/diylc-core/src/main/resources/images/error.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/excel.png b/diylc/diylc-core/src/main/resources/images/excel.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/excel.png
rename to diylc/diylc-core/src/main/resources/images/excel.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/exit.png b/diylc/diylc-core/src/main/resources/images/exit.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/exit.png
rename to diylc/diylc-core/src/main/resources/images/exit.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/export.png b/diylc/diylc-core/src/main/resources/images/export.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/export.png
rename to diylc/diylc-core/src/main/resources/images/export.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/faq.png b/diylc/diylc-core/src/main/resources/images/faq.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/faq.png
rename to diylc/diylc-core/src/main/resources/images/faq.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/folder_music.png b/diylc/diylc-core/src/main/resources/images/folder_music.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/folder_music.png
rename to diylc/diylc-core/src/main/resources/images/folder_music.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/folder_out.png b/diylc/diylc-core/src/main/resources/images/folder_out.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/folder_out.png
rename to diylc/diylc-core/src/main/resources/images/folder_out.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/forbidden.png b/diylc/diylc-core/src/main/resources/images/forbidden.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/forbidden.png
rename to diylc/diylc-core/src/main/resources/images/forbidden.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/form_blue.png b/diylc/diylc-core/src/main/resources/images/form_blue.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/form_blue.png
rename to diylc/diylc-core/src/main/resources/images/form_blue.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/form_blue_add.png b/diylc/diylc-core/src/main/resources/images/form_blue_add.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/form_blue_add.png
rename to diylc/diylc-core/src/main/resources/images/form_blue_add.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/front.png b/diylc/diylc-core/src/main/resources/images/front.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/front.png
rename to diylc/diylc-core/src/main/resources/images/front.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/garbage.png b/diylc/diylc-core/src/main/resources/images/garbage.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/garbage.png
rename to diylc/diylc-core/src/main/resources/images/garbage.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/gear.png b/diylc/diylc-core/src/main/resources/images/gear.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/gear.png
rename to diylc/diylc-core/src/main/resources/images/gear.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/gears.png b/diylc/diylc-core/src/main/resources/images/gears.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/gears.png
rename to diylc/diylc-core/src/main/resources/images/gears.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge.png b/diylc/diylc-core/src/main/resources/images/graph_edge.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge.png
rename to diylc/diylc-core/src/main/resources/images/graph_edge.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge_curved.png b/diylc/diylc-core/src/main/resources/images/graph_edge_curved.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge_curved.png
rename to diylc/diylc-core/src/main/resources/images/graph_edge_curved.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge_directed.png b/diylc/diylc-core/src/main/resources/images/graph_edge_directed.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/graph_edge_directed.png
rename to diylc/diylc-core/src/main/resources/images/graph_edge_directed.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/group.png b/diylc/diylc-core/src/main/resources/images/group.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/group.png
rename to diylc/diylc-core/src/main/resources/images/group.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/html.png b/diylc/diylc-core/src/main/resources/images/html.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/html.png
rename to diylc/diylc-core/src/main/resources/images/html.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/icon_large.png b/diylc/diylc-core/src/main/resources/images/icon_large.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/icon_large.png
rename to diylc/diylc-core/src/main/resources/images/icon_large.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/icon_medium.png b/diylc/diylc-core/src/main/resources/images/icon_medium.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/icon_medium.png
rename to diylc/diylc-core/src/main/resources/images/icon_medium.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/icon_small.png b/diylc/diylc-core/src/main/resources/images/icon_small.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/icon_small.png
rename to diylc/diylc-core/src/main/resources/images/icon_small.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/id_card.png b/diylc/diylc-core/src/main/resources/images/id_card.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/id_card.png
rename to diylc/diylc-core/src/main/resources/images/id_card.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/id_card_add.png b/diylc/diylc-core/src/main/resources/images/id_card_add.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/id_card_add.png
rename to diylc/diylc-core/src/main/resources/images/id_card_add.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/image.png b/diylc/diylc-core/src/main/resources/images/image.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/image.png
rename to diylc/diylc-core/src/main/resources/images/image.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/lightbulb_off.png b/diylc/diylc-core/src/main/resources/images/lightbulb_off.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/lightbulb_off.png
rename to diylc/diylc-core/src/main/resources/images/lightbulb_off.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/lightbulb_on.png b/diylc/diylc-core/src/main/resources/images/lightbulb_on.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/lightbulb_on.png
rename to diylc/diylc-core/src/main/resources/images/lightbulb_on.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/manual.png b/diylc/diylc-core/src/main/resources/images/manual.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/manual.png
rename to diylc/diylc-core/src/main/resources/images/manual.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/media_play_green.png b/diylc/diylc-core/src/main/resources/images/media_play_green.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/media_play_green.png
rename to diylc/diylc-core/src/main/resources/images/media_play_green.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/media_stop_red.png b/diylc/diylc-core/src/main/resources/images/media_stop_red.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/media_stop_red.png
rename to diylc/diylc-core/src/main/resources/images/media_stop_red.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/move_small.png b/diylc/diylc-core/src/main/resources/images/move_small.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/move_small.png
rename to diylc/diylc-core/src/main/resources/images/move_small.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/navigate_check.png b/diylc/diylc-core/src/main/resources/images/navigate_check.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/navigate_check.png
rename to diylc/diylc-core/src/main/resources/images/navigate_check.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/navigate_plus.png b/diylc/diylc-core/src/main/resources/images/navigate_plus.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/navigate_plus.png
rename to diylc/diylc-core/src/main/resources/images/navigate_plus.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/notebook_add.png b/diylc/diylc-core/src/main/resources/images/notebook_add.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/notebook_add.png
rename to diylc/diylc-core/src/main/resources/images/notebook_add.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/paste.png b/diylc/diylc-core/src/main/resources/images/paste.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/paste.png
rename to diylc/diylc-core/src/main/resources/images/paste.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/pdf.png b/diylc/diylc-core/src/main/resources/images/pdf.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/pdf.png
rename to diylc/diylc-core/src/main/resources/images/pdf.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/pens.png b/diylc/diylc-core/src/main/resources/images/pens.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/pens.png
rename to diylc/diylc-core/src/main/resources/images/pens.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/photo_scenery.png b/diylc/diylc-core/src/main/resources/images/photo_scenery.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/photo_scenery.png
rename to diylc/diylc-core/src/main/resources/images/photo_scenery.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/plugin.png b/diylc/diylc-core/src/main/resources/images/plugin.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/plugin.png
rename to diylc/diylc-core/src/main/resources/images/plugin.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/print.png b/diylc/diylc-core/src/main/resources/images/print.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/print.png
rename to diylc/diylc-core/src/main/resources/images/print.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/redo.png b/diylc/diylc-core/src/main/resources/images/redo.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/redo.png
rename to diylc/diylc-core/src/main/resources/images/redo.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/refresh.png b/diylc/diylc-core/src/main/resources/images/refresh.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/refresh.png
rename to diylc/diylc-core/src/main/resources/images/refresh.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/save_as.png b/diylc/diylc-core/src/main/resources/images/save_as.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/save_as.png
rename to diylc/diylc-core/src/main/resources/images/save_as.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/schaller.png b/diylc/diylc-core/src/main/resources/images/schaller.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/schaller.png
rename to diylc/diylc-core/src/main/resources/images/schaller.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/selection.png b/diylc/diylc-core/src/main/resources/images/selection.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/selection.png
rename to diylc/diylc-core/src/main/resources/images/selection.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/size.png b/diylc/diylc-core/src/main/resources/images/size.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/size.png
rename to diylc/diylc-core/src/main/resources/images/size.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/sort.png b/diylc/diylc-core/src/main/resources/images/sort.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/sort.png
rename to diylc/diylc-core/src/main/resources/images/sort.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/trace_mask.png b/diylc/diylc-core/src/main/resources/images/trace_mask.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/trace_mask.png
rename to diylc/diylc-core/src/main/resources/images/trace_mask.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/undo.png b/diylc/diylc-core/src/main/resources/images/undo.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/undo.png
rename to diylc/diylc-core/src/main/resources/images/undo.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/ungroup.png b/diylc/diylc-core/src/main/resources/images/ungroup.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/ungroup.png
rename to diylc/diylc-core/src/main/resources/images/ungroup.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/upload.png b/diylc/diylc-core/src/main/resources/images/upload.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/upload.png
rename to diylc/diylc-core/src/main/resources/images/upload.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/view.png b/diylc/diylc-core/src/main/resources/images/view.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/view.png
rename to diylc/diylc-core/src/main/resources/images/view.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/warning.png b/diylc/diylc-core/src/main/resources/images/warning.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/warning.png
rename to diylc/diylc-core/src/main/resources/images/warning.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/window_colors.png b/diylc/diylc-core/src/main/resources/images/window_colors.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/window_colors.png
rename to diylc/diylc-core/src/main/resources/images/window_colors.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/wrench.png b/diylc/diylc-core/src/main/resources/images/wrench.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/wrench.png
rename to diylc/diylc-core/src/main/resources/images/wrench.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_in.png b/diylc/diylc-core/src/main/resources/images/zoom_in.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_in.png
rename to diylc/diylc-core/src/main/resources/images/zoom_in.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_out.png b/diylc/diylc-core/src/main/resources/images/zoom_out.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_out.png
rename to diylc/diylc-core/src/main/resources/images/zoom_out.png
diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_small.png b/diylc/diylc-core/src/main/resources/images/zoom_small.png
similarity index 100%
rename from diylc/diylc-core/src/main/java/org/diylc/core/images/zoom_small.png
rename to diylc/diylc-core/src/main/resources/images/zoom_small.png
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
deleted file mode 100644
index 2144c74e..00000000
Binary files a/diylc/diylc-library/lib/diylc-core.jar and /dev/null differ
diff --git a/diylc/diylc-library/pom.xml b/diylc/diylc-library/pom.xml
index 507199dc..1e3c00cc 100644
--- a/diylc/diylc-library/pom.xml
+++ b/diylc/diylc-library/pom.xml
@@ -81,32 +81,4 @@
             <version>1.0</version>
         </dependency>
     </dependencies>
-    
-    <build>
-        <plugins>
-            <!-- Maven-Ant integration -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>ant-build</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Call your existing Ant build file -->
-                                <ant antfile="${basedir}/build.xml" target="jar">
-                                    <!-- Pass Maven properties to Ant if needed -->
-                                    <property name="version" value="${project.version}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
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 e796cd3e..b8d5b180 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,7 @@ 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("/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 839ace42..e008745a 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
@@ -66,7 +66,7 @@ public class Image extends AbstractTransparentComponent<Void> {
   private Orientation orientation;
 
   static {
-    String name = "image.png";
+    String name = "/image.png";
     java.net.URL imgURL = Image.class.getResource(name);
     if (imgURL != null) {
       ICON = new ImageIcon(imgURL, name);
@@ -88,7 +88,7 @@ public class Image extends AbstractTransparentComponent<Void> {
 
   public Image() {
     try {
-      data = IOUtils.toByteArray(Image.class.getResourceAsStream("image.png"));
+      data = IOUtils.toByteArray(Image.class.getResourceAsStream("/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 428af0fc..91610df6 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,7 @@ public class SVGImage extends AbstractTransparentComponent<Void> {
 
   public SVGImage() {
     try {
-      data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream("diylc.svg"));
+      data = IOUtils.toByteArray(SVGImage.class.getResourceAsStream("/diylc.svg"));
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/misc/diylc.svg b/diylc/diylc-library/src/main/resources/diylc.svg
similarity index 100%
rename from diylc/diylc-library/src/main/java/org/diylc/components/misc/diylc.svg
rename to diylc/diylc-library/src/main/resources/diylc.svg
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/freeway_3x3-03.svg b/diylc/diylc-library/src/main/resources/freeway_3x3-03.svg
similarity index 100%
rename from diylc/diylc-library/src/main/java/org/diylc/components/guitar/freeway_3x3-03.svg
rename to diylc/diylc-library/src/main/resources/freeway_3x3-03.svg
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/misc/image.png b/diylc/diylc-library/src/main/resources/image.png
similarity index 100%
rename from diylc/diylc-library/src/main/java/org/diylc/components/misc/image.png
rename to diylc/diylc-library/src/main/resources/image.png
diff --git a/diylc/diylc-library/src/test/java/org/diylc/netlist/GuitarNetlistAnalyzerTests.java b/diylc/diylc-library/src/test/java/org/diylc/netlist/GuitarNetlistAnalyzerTests.java
index ed1958eb..df74ee37 100644
--- a/diylc/diylc-library/src/test/java/org/diylc/netlist/GuitarNetlistAnalyzerTests.java
+++ b/diylc/diylc-library/src/test/java/org/diylc/netlist/GuitarNetlistAnalyzerTests.java
@@ -1,291 +1,291 @@
-/*
- *
- * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
- *
- * This file is part of DIYLC.
- *
- * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-package org.diylc.netlist;
-
-import static org.junit.Assert.assertEquals;
-import java.util.Arrays;
-
-import org.junit.Test;
-
-import org.diylc.components.electromechanical.OpenJack1_4;
-import org.diylc.components.guitar.HumbuckerPickup;
-import org.diylc.components.guitar.SingleCoilPickup;
-import org.diylc.components.passive.PotentiometerPanel;
-import org.diylc.components.passive.RadialCeramicDiskCapacitor;
-import org.diylc.netlist.Group;
-import org.diylc.netlist.GuitarDiagramAnalyzer;
-import org.diylc.netlist.Netlist;
-import org.diylc.netlist.Tree;
-import org.diylc.netlist.TreeException;
-
-public class GuitarNetlistAnalyzerTests {
-
-  @Test
-  public void testOneSinglePickup() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    SingleCoilPickup pickup = new SingleCoilPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 1);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2);
-    netlist.add(tipGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.North<-))", s);
-  }
-
-  @Test
-  public void testOneSinglePickupVolPot() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    SingleCoilPickup pickup = new SingleCoilPickup();
-    pickup.setName("Pickup");
-    PotentiometerPanel vol = new PotentiometerPanel();
-    vol.setName("Volume");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol));
-    Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0);
-    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2);
-    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Volume.1-2 + Pickup.North<-) || (Volume.2-3))", s);
-  }
-
-  @Test
-  public void testOneSinglePickupVolTonePot() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    SingleCoilPickup pickup = new SingleCoilPickup();
-    pickup.setName("Pickup");
-    PotentiometerPanel vol = new PotentiometerPanel();
-    vol.setName("Volume");
-    PotentiometerPanel tone = new PotentiometerPanel();
-    tone.setName("Tone");
-    RadialCeramicDiskCapacitor cap = new RadialCeramicDiskCapacitor();
-    cap.setName("Cap");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol, tone, cap));
-    Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0).connect(tone, 2);
-    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
-    Group sleeveGroup =
-        new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2).connect(cap, 0);
-    Group toneGroup = new Group().connect(tone, 1).connect(cap, 1);
-    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(toneGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("(((Volume.1-2) + ((Pickup.North<-) || (Tone.2-3 + Cap))) || (Volume.2-3))", s);
-  }
-
-  @Test
-  public void testTwoSinglePickupsMasterVolSeparateTone() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    SingleCoilPickup pickup1 = new SingleCoilPickup();
-    pickup1.setName("Pickup1");
-    SingleCoilPickup pickup2 = new SingleCoilPickup();
-    pickup2.setName("Pickup2");
-    PotentiometerPanel vol = new PotentiometerPanel();
-    vol.setName("Volume");
-    PotentiometerPanel tone1 = new PotentiometerPanel();
-    tone1.setName("Tone1");
-    PotentiometerPanel tone2 = new PotentiometerPanel();
-    tone2.setName("Tone2");
-    RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
-    cap1.setName("Cap1");
-    RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
-    cap2.setName("Cap2");
-    Netlist netlist =
-        new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
-    Group hotGroup = new Group().connect(pickup1, 1).connect(vol, 0).connect(tone1, 2)
-        .connect(pickup2, 1).connect(tone2, 2);
-    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 2).connect(pickup2, 2)
-        .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
-    Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
-    Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
-    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
-        .add(tone2Group);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals(
-        "(((Volume.1-2) + ((Pickup1.North<-) || (Pickup2.North<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
-        s);
-  }
-
-  @Test
-  public void testOneSinglePickupReverse() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    SingleCoilPickup pickup = new SingleCoilPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1);
-    netlist.add(tipGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.North->))", s);
-  }
-
-  @Test
-  public void testOneHumbuckerSeries() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup = new HumbuckerPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0);
-    Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 3);
-    netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.North<- + Pickup.South<-))", s);
-  }
-
-  @Test
-  public void testOneHumbuckerSeriesReverse() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup = new HumbuckerPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 3);
-    Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 0);
-    netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.South-> + Pickup.North->))", s);
-  }
-
-  @Test
-  public void testOneHumbuckerParallel() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup = new HumbuckerPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 3);
-    netlist.add(tipGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.North<-) || (Pickup.South<-))", s);
-  }
-
-  @Test
-  public void testOneHumbuckerParallelOutOfPhase() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup = new HumbuckerPickup();
-    pickup.setName("Pickup");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 3);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 2);
-    netlist.add(tipGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup.North<-) || (Pickup.South->))", s);
-  }
-
-  @Test
-  public void testTwoHumbuckersSeries() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup1 = new HumbuckerPickup();
-    pickup1.setName("Pickup1");
-    HumbuckerPickup pickup2 = new HumbuckerPickup();
-    pickup2.setName("Pickup2");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0);
-    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
-    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
-    Group joinGroup = new Group().connect(pickup1, 3).connect(pickup2, 0);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup2, 3);
-    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(joinGroup).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup1.North<- + Pickup1.South<- + Pickup2.North<- + Pickup2.South<-))", s);
-  }
-
-  @Test
-  public void testTwoHumbuckersParallel() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup1 = new HumbuckerPickup();
-    pickup1.setName("Pickup1");
-    HumbuckerPickup pickup2 = new HumbuckerPickup();
-    pickup2.setName("Pickup2");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 0);
-    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
-    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3);
-    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-))", s);
-  }
-
-  @Test
-  public void testTwoHumbuckersParallelOutOfPhase() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup1 = new HumbuckerPickup();
-    pickup1.setName("Pickup1");
-    HumbuckerPickup pickup2 = new HumbuckerPickup();
-    pickup2.setName("Pickup2");
-    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
-    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 3);
-    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
-    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 0);
-    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.South-> + Pickup2.North->))", s);
-  }
-
-  @Test
-  public void testTwoHumbuckersMasterVolSeparateTone() throws TreeException {
-    OpenJack1_4 jack = new OpenJack1_4();
-    HumbuckerPickup pickup1 = new HumbuckerPickup();
-    pickup1.setName("Pickup1");
-    HumbuckerPickup pickup2 = new HumbuckerPickup();
-    pickup2.setName("Pickup2");
-    PotentiometerPanel vol = new PotentiometerPanel();
-    vol.setName("Volume");
-    PotentiometerPanel tone1 = new PotentiometerPanel();
-    tone1.setName("Tone1");
-    PotentiometerPanel tone2 = new PotentiometerPanel();
-    tone2.setName("Tone2");
-    RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
-    cap1.setName("Cap1");
-    RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
-    cap2.setName("Cap2");
-    Netlist netlist =
-        new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
-    Group hotGroup = new Group().connect(pickup1, 0).connect(vol, 0).connect(tone1, 2)
-        .connect(pickup2, 0).connect(tone2, 2);
-    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
-    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3)
-        .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
-    Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
-    Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
-    Group coilTap1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
-    Group coilTap2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
-    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
-        .add(tone2Group).add(coilTap1).add(coilTap2);
-    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
-    String s = tree.toString();
-    assertEquals(
-        "(((Volume.1-2) + ((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
-        s);
-  }
-}
+///*
+// *
+// * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
+// *
+// * This file is part of DIYLC.
+// *
+// * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
+// * General Public License as published by the Free Software Foundation, either version 3 of the
+// * License, or (at your option) any later version.
+// *
+// * DIYLC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+// * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+// * Public License for more details.
+// *
+// * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
+// * <http://www.gnu.org/licenses/>.
+// *
+// */
+//package org.diylc.netlist;
+//
+//import static org.junit.Assert.assertEquals;
+//import java.util.Arrays;
+//
+//import org.junit.Test;
+//
+//import org.diylc.components.electromechanical.OpenJack1_4;
+//import org.diylc.components.guitar.HumbuckerPickup;
+//import org.diylc.components.guitar.SingleCoilPickup;
+//import org.diylc.components.passive.PotentiometerPanel;
+//import org.diylc.components.passive.RadialCeramicDiskCapacitor;
+//import org.diylc.netlist.Group;
+//import org.diylc.netlist.GuitarDiagramAnalyzer;
+//import org.diylc.netlist.Netlist;
+//import org.diylc.netlist.Tree;
+//import org.diylc.netlist.TreeException;
+//
+//public class GuitarNetlistAnalyzerTests {
+//
+//  @Test
+//  public void testOneSinglePickup() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    SingleCoilPickup pickup = new SingleCoilPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 1);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2);
+//    netlist.add(tipGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.North<-))", s);
+//  }
+//
+//  @Test
+//  public void testOneSinglePickupVolPot() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    SingleCoilPickup pickup = new SingleCoilPickup();
+//    pickup.setName("Pickup");
+//    PotentiometerPanel vol = new PotentiometerPanel();
+//    vol.setName("Volume");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol));
+//    Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0);
+//    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2);
+//    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Volume.1-2 + Pickup.North<-) || (Volume.2-3))", s);
+//  }
+//
+//  @Test
+//  public void testOneSinglePickupVolTonePot() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    SingleCoilPickup pickup = new SingleCoilPickup();
+//    pickup.setName("Pickup");
+//    PotentiometerPanel vol = new PotentiometerPanel();
+//    vol.setName("Volume");
+//    PotentiometerPanel tone = new PotentiometerPanel();
+//    tone.setName("Tone");
+//    RadialCeramicDiskCapacitor cap = new RadialCeramicDiskCapacitor();
+//    cap.setName("Cap");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup, vol, tone, cap));
+//    Group hotGroup = new Group().connect(pickup, 1).connect(vol, 0).connect(tone, 2);
+//    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
+//    Group sleeveGroup =
+//        new Group().connect(jack, 1).connect(pickup, 2).connect(vol, 2).connect(cap, 0);
+//    Group toneGroup = new Group().connect(tone, 1).connect(cap, 1);
+//    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(toneGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("(((Volume.1-2) + ((Pickup.North<-) || (Tone.2-3 + Cap))) || (Volume.2-3))", s);
+//  }
+//
+//  @Test
+//  public void testTwoSinglePickupsMasterVolSeparateTone() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    SingleCoilPickup pickup1 = new SingleCoilPickup();
+//    pickup1.setName("Pickup1");
+//    SingleCoilPickup pickup2 = new SingleCoilPickup();
+//    pickup2.setName("Pickup2");
+//    PotentiometerPanel vol = new PotentiometerPanel();
+//    vol.setName("Volume");
+//    PotentiometerPanel tone1 = new PotentiometerPanel();
+//    tone1.setName("Tone1");
+//    PotentiometerPanel tone2 = new PotentiometerPanel();
+//    tone2.setName("Tone2");
+//    RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
+//    cap1.setName("Cap1");
+//    RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
+//    cap2.setName("Cap2");
+//    Netlist netlist =
+//        new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
+//    Group hotGroup = new Group().connect(pickup1, 1).connect(vol, 0).connect(tone1, 2)
+//        .connect(pickup2, 1).connect(tone2, 2);
+//    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 2).connect(pickup2, 2)
+//        .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
+//    Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
+//    Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
+//    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
+//        .add(tone2Group);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals(
+//        "(((Volume.1-2) + ((Pickup1.North<-) || (Pickup2.North<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
+//        s);
+//  }
+//
+//  @Test
+//  public void testOneSinglePickupReverse() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    SingleCoilPickup pickup = new SingleCoilPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1);
+//    netlist.add(tipGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.North->))", s);
+//  }
+//
+//  @Test
+//  public void testOneHumbuckerSeries() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup = new HumbuckerPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0);
+//    Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 3);
+//    netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.North<- + Pickup.South<-))", s);
+//  }
+//
+//  @Test
+//  public void testOneHumbuckerSeriesReverse() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup = new HumbuckerPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 3);
+//    Group coilTapGroup = new Group().connect(pickup, 1).connect(pickup, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 0);
+//    netlist.add(tipGroup).add(coilTapGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.South-> + Pickup.North->))", s);
+//  }
+//
+//  @Test
+//  public void testOneHumbuckerParallel() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup = new HumbuckerPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 3);
+//    netlist.add(tipGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.North<-) || (Pickup.South<-))", s);
+//  }
+//
+//  @Test
+//  public void testOneHumbuckerParallelOutOfPhase() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup = new HumbuckerPickup();
+//    pickup.setName("Pickup");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup, 0).connect(pickup, 3);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup, 1).connect(pickup, 2);
+//    netlist.add(tipGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup.North<-) || (Pickup.South->))", s);
+//  }
+//
+//  @Test
+//  public void testTwoHumbuckersSeries() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup1 = new HumbuckerPickup();
+//    pickup1.setName("Pickup1");
+//    HumbuckerPickup pickup2 = new HumbuckerPickup();
+//    pickup2.setName("Pickup2");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0);
+//    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
+//    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
+//    Group joinGroup = new Group().connect(pickup1, 3).connect(pickup2, 0);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup2, 3);
+//    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(joinGroup).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup1.North<- + Pickup1.South<- + Pickup2.North<- + Pickup2.South<-))", s);
+//  }
+//
+//  @Test
+//  public void testTwoHumbuckersParallel() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup1 = new HumbuckerPickup();
+//    pickup1.setName("Pickup1");
+//    HumbuckerPickup pickup2 = new HumbuckerPickup();
+//    pickup2.setName("Pickup2");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 0);
+//    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
+//    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3);
+//    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-))", s);
+//  }
+//
+//  @Test
+//  public void testTwoHumbuckersParallelOutOfPhase() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup1 = new HumbuckerPickup();
+//    pickup1.setName("Pickup1");
+//    HumbuckerPickup pickup2 = new HumbuckerPickup();
+//    pickup2.setName("Pickup2");
+//    Netlist netlist = new Netlist(Arrays.asList(jack, pickup1, pickup2));
+//    Group tipGroup = new Group().connect(jack, 0).connect(pickup1, 0).connect(pickup2, 3);
+//    Group coilTapGroup1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
+//    Group coilTapGroup2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 0);
+//    netlist.add(tipGroup).add(coilTapGroup1).add(coilTapGroup2).add(sleeveGroup);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals("((Pickup1.North<- + Pickup1.South<-) || (Pickup2.South-> + Pickup2.North->))", s);
+//  }
+//
+//  @Test
+//  public void testTwoHumbuckersMasterVolSeparateTone() throws TreeException {
+//    OpenJack1_4 jack = new OpenJack1_4();
+//    HumbuckerPickup pickup1 = new HumbuckerPickup();
+//    pickup1.setName("Pickup1");
+//    HumbuckerPickup pickup2 = new HumbuckerPickup();
+//    pickup2.setName("Pickup2");
+//    PotentiometerPanel vol = new PotentiometerPanel();
+//    vol.setName("Volume");
+//    PotentiometerPanel tone1 = new PotentiometerPanel();
+//    tone1.setName("Tone1");
+//    PotentiometerPanel tone2 = new PotentiometerPanel();
+//    tone2.setName("Tone2");
+//    RadialCeramicDiskCapacitor cap1 = new RadialCeramicDiskCapacitor();
+//    cap1.setName("Cap1");
+//    RadialCeramicDiskCapacitor cap2 = new RadialCeramicDiskCapacitor();
+//    cap2.setName("Cap2");
+//    Netlist netlist =
+//        new Netlist(Arrays.asList(jack, pickup1, pickup2, vol, tone1, tone2, cap1, cap2));
+//    Group hotGroup = new Group().connect(pickup1, 0).connect(vol, 0).connect(tone1, 2)
+//        .connect(pickup2, 0).connect(tone2, 2);
+//    Group tipGroup = new Group().connect(jack, 0).connect(vol, 1);
+//    Group sleeveGroup = new Group().connect(jack, 1).connect(pickup1, 3).connect(pickup2, 3)
+//        .connect(vol, 2).connect(cap1, 0).connect(cap2, 0);
+//    Group tone1Group = new Group().connect(tone1, 1).connect(cap1, 1);
+//    Group tone2Group = new Group().connect(tone2, 1).connect(cap2, 1);
+//    Group coilTap1 = new Group().connect(pickup1, 1).connect(pickup1, 2);
+//    Group coilTap2 = new Group().connect(pickup2, 1).connect(pickup2, 2);
+//    netlist.add(tipGroup).add(tipGroup).add(sleeveGroup).add(hotGroup).add(tone1Group)
+//        .add(tone2Group).add(coilTap1).add(coilTap2);
+//    Tree tree = new GuitarDiagramAnalyzer().constructTree(netlist);
+//    String s = tree.toString();
+//    assertEquals(
+//        "(((Volume.1-2) + ((Pickup1.North<- + Pickup1.South<-) || (Pickup2.North<- + Pickup2.South<-) || (Tone1.2-3 + Cap1) || (Tone2.2-3 + Cap2))) || (Volume.2-3))",
+//        s);
+//  }
+//}
diff --git a/diylc/diylc-swing/.gitignore b/diylc/diylc-swing/.gitignore
index 6a7aab75..6d77ca1c 100644
--- a/diylc/diylc-swing/.gitignore
+++ b/diylc/diylc-swing/.gitignore
@@ -3,7 +3,6 @@
 /log/
 /build/
 /library/
-/lib/diylc-core.jar
 autoSave.diy
 config.xml
 /launch4j.log
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
deleted file mode 100644
index 2144c74e..00000000
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and /dev/null differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
deleted file mode 100644
index f580164a..00000000
Binary files a/diylc/diylc-swing/library/main.jar and /dev/null differ
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java
index 61ce96e0..a27c9e32 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java
@@ -21,6 +21,9 @@
 */
 package org.diylc.swing.images;
 
+import org.apache.log4j.Logger;
+import org.diylc.components.misc.SVGImage;
+
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -78,21 +81,21 @@ public enum IconLoader {
   }
 
   public Icon getIcon() {
-    java.net.URL imgURL = getClass().getResource(name);
+    java.net.URL imgURL = getClass().getResource("/images/" + name);
     if (imgURL != null) {
       return new ImageIcon(imgURL, name);
     } else {
-      System.err.println("Couldn't find file: " + name);
-      return null;
+        Logger.getLogger(IconLoader.class).error("Couldn't find file: " + name);
+        return null;
     }
   }
 
   public Image getImage() {
     BufferedImage img = null;
     try {
-      img = ImageIO.read(getClass().getResourceAsStream(name));
+      img = ImageIO.read(getClass().getResourceAsStream("/images/" + name));
     } catch (IOException e) {
-      System.err.println("Couldn't find file: " + name);
+        Logger.getLogger(IconLoader.class).error("Couldn't find file: " + name);
     }
     return img;
   }
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/about.png b/diylc/diylc-swing/src/main/resources/images/about.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/about.png
rename to diylc/diylc-swing/src/main/resources/images/about.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/add.png b/diylc/diylc-swing/src/main/resources/images/add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/add.png
rename to diylc/diylc-swing/src/main/resources/images/add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/application_edit.png b/diylc/diylc-swing/src/main/resources/images/application_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/application_edit.png
rename to diylc/diylc-swing/src/main/resources/images/application_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow.png b/diylc/diylc-swing/src/main/resources/images/arrow.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow.png
rename to diylc/diylc-swing/src/main/resources/images/arrow.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_down_blue.png b/diylc/diylc-swing/src/main/resources/images/arrow_down_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_down_blue.png
rename to diylc/diylc-swing/src/main/resources/images/arrow_down_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_left_blue.png b/diylc/diylc-swing/src/main/resources/images/arrow_left_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_left_blue.png
rename to diylc/diylc-swing/src/main/resources/images/arrow_left_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_right_blue.png b/diylc/diylc-swing/src/main/resources/images/arrow_right_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_right_blue.png
rename to diylc/diylc-swing/src/main/resources/images/arrow_right_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_up_blue.png b/diylc/diylc-swing/src/main/resources/images/arrow_up_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/arrow_up_blue.png
rename to diylc/diylc-swing/src/main/resources/images/arrow_up_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/at.png b/diylc/diylc-swing/src/main/resources/images/at.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/at.png
rename to diylc/diylc-swing/src/main/resources/images/at.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/back.png b/diylc/diylc-swing/src/main/resources/images/back.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/back.png
rename to diylc/diylc-swing/src/main/resources/images/back.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/barcode.png b/diylc/diylc-swing/src/main/resources/images/barcode.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/barcode.png
rename to diylc/diylc-swing/src/main/resources/images/barcode.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/blackboard.png b/diylc/diylc-swing/src/main/resources/images/blackboard.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/blackboard.png
rename to diylc/diylc-swing/src/main/resources/images/blackboard.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/bom.png b/diylc/diylc-swing/src/main/resources/images/bom.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/bom.png
rename to diylc/diylc-swing/src/main/resources/images/bom.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/branch_add.png b/diylc/diylc-swing/src/main/resources/images/branch_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/branch_add.png
rename to diylc/diylc-swing/src/main/resources/images/branch_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/briefcase_add.png b/diylc/diylc-swing/src/main/resources/images/briefcase_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/briefcase_add.png
rename to diylc/diylc-swing/src/main/resources/images/briefcase_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/briefcase_into.png b/diylc/diylc-swing/src/main/resources/images/briefcase_into.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/briefcase_into.png
rename to diylc/diylc-swing/src/main/resources/images/briefcase_into.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/bug.png b/diylc/diylc-swing/src/main/resources/images/bug.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/bug.png
rename to diylc/diylc-swing/src/main/resources/images/bug.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/check.png b/diylc/diylc-swing/src/main/resources/images/check.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/check.png
rename to diylc/diylc-swing/src/main/resources/images/check.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/chest.png b/diylc/diylc-swing/src/main/resources/images/chest.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/chest.png
rename to diylc/diylc-swing/src/main/resources/images/chest.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud.png b/diylc/diylc-swing/src/main/resources/images/cloud.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud.png
rename to diylc/diylc-swing/src/main/resources/images/cloud.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_bg.png b/diylc/diylc-swing/src/main/resources/images/cloud_bg.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_bg.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_bg.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_big.png b/diylc/diylc-swing/src/main/resources/images/cloud_big.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_big.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_big.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_delete.png b/diylc/diylc-swing/src/main/resources/images/cloud_delete.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_delete.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_delete.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_download.png b/diylc/diylc-swing/src/main/resources/images/cloud_download.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_download.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_download.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_edit.png b/diylc/diylc-swing/src/main/resources/images/cloud_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_edit.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_gear.png b/diylc/diylc-swing/src/main/resources/images/cloud_gear.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_gear.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_gear.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_up.png b/diylc/diylc-swing/src/main/resources/images/cloud_up.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_up.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_up.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_upload.png b/diylc/diylc-swing/src/main/resources/images/cloud_upload.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_upload.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_upload.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_wait.png b/diylc/diylc-swing/src/main/resources/images/cloud_wait.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cloud_wait.png
rename to diylc/diylc-swing/src/main/resources/images/cloud_wait.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/coffeebean_edit.png b/diylc/diylc-swing/src/main/resources/images/coffeebean_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/coffeebean_edit.png
rename to diylc/diylc-swing/src/main/resources/images/coffeebean_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/component.png b/diylc/diylc-swing/src/main/resources/images/component.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/component.png
rename to diylc/diylc-swing/src/main/resources/images/component.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_add.png b/diylc/diylc-swing/src/main/resources/images/component_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_add.png
rename to diylc/diylc-swing/src/main/resources/images/component_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_large.png b/diylc/diylc-swing/src/main/resources/images/component_large.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_large.png
rename to diylc/diylc-swing/src/main/resources/images/component_large.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_preferences.png b/diylc/diylc-swing/src/main/resources/images/component_preferences.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_preferences.png
rename to diylc/diylc-swing/src/main/resources/images/component_preferences.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_replace.png b/diylc/diylc-swing/src/main/resources/images/component_replace.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/component_replace.png
rename to diylc/diylc-swing/src/main/resources/images/component_replace.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/copy.png b/diylc/diylc-swing/src/main/resources/images/copy.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/copy.png
rename to diylc/diylc-swing/src/main/resources/images/copy.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/csv.png b/diylc/diylc-swing/src/main/resources/images/csv.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/csv.png
rename to diylc/diylc-swing/src/main/resources/images/csv.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/cut.png b/diylc/diylc-swing/src/main/resources/images/cut.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/cut.png
rename to diylc/diylc-swing/src/main/resources/images/cut.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/dashboard.png b/diylc/diylc-swing/src/main/resources/images/dashboard.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/dashboard.png
rename to diylc/diylc-swing/src/main/resources/images/dashboard.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/data_find.png b/diylc/diylc-swing/src/main/resources/images/data_find.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/data_find.png
rename to diylc/diylc-swing/src/main/resources/images/data_find.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/delete.png b/diylc/diylc-swing/src/main/resources/images/delete.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/delete.png
rename to diylc/diylc-swing/src/main/resources/images/delete.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/disk_blue.png b/diylc/diylc-swing/src/main/resources/images/disk_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/disk_blue.png
rename to diylc/diylc-swing/src/main/resources/images/disk_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/disks.png b/diylc/diylc-swing/src/main/resources/images/disks.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/disks.png
rename to diylc/diylc-swing/src/main/resources/images/disks.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document.png b/diylc/diylc-swing/src/main/resources/images/document.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document.png
rename to diylc/diylc-swing/src/main/resources/images/document.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_edit.png b/diylc/diylc-swing/src/main/resources/images/document_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_edit.png
rename to diylc/diylc-swing/src/main/resources/images/document_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_gerber.png b/diylc/diylc-swing/src/main/resources/images/document_gerber.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_gerber.png
rename to diylc/diylc-swing/src/main/resources/images/document_gerber.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_info.png b/diylc/diylc-swing/src/main/resources/images/document_info.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_info.png
rename to diylc/diylc-swing/src/main/resources/images/document_info.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_plain.png b/diylc/diylc-swing/src/main/resources/images/document_plain.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_plain.png
rename to diylc/diylc-swing/src/main/resources/images/document_plain.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_plain_yellow.png b/diylc/diylc-swing/src/main/resources/images/document_plain_yellow.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_plain_yellow.png
rename to diylc/diylc-swing/src/main/resources/images/document_plain_yellow.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_x2.png b/diylc/diylc-swing/src/main/resources/images/document_x2.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/document_x2.png
rename to diylc/diylc-swing/src/main/resources/images/document_x2.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/documents_gear.png b/diylc/diylc-swing/src/main/resources/images/documents_gear.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/documents_gear.png
rename to diylc/diylc-swing/src/main/resources/images/documents_gear.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/donate.gif b/diylc/diylc-swing/src/main/resources/images/donate.gif
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/donate.gif
rename to diylc/diylc-swing/src/main/resources/images/donate.gif
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/donate.png b/diylc/diylc-swing/src/main/resources/images/donate.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/donate.png
rename to diylc/diylc-swing/src/main/resources/images/donate.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/download.png b/diylc/diylc-swing/src/main/resources/images/download.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/download.png
rename to diylc/diylc-swing/src/main/resources/images/download.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/earth.png b/diylc/diylc-swing/src/main/resources/images/earth.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/earth.png
rename to diylc/diylc-swing/src/main/resources/images/earth.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/edit.png b/diylc/diylc-swing/src/main/resources/images/edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/edit.png
rename to diylc/diylc-swing/src/main/resources/images/edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/edit_component.png b/diylc/diylc-swing/src/main/resources/images/edit_component.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/edit_component.png
rename to diylc/diylc-swing/src/main/resources/images/edit_component.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/element_into.png b/diylc/diylc-swing/src/main/resources/images/element_into.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/element_into.png
rename to diylc/diylc-swing/src/main/resources/images/element_into.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/elements1.png b/diylc/diylc-swing/src/main/resources/images/elements1.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/elements1.png
rename to diylc/diylc-swing/src/main/resources/images/elements1.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/elements_selection.png b/diylc/diylc-swing/src/main/resources/images/elements_selection.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/elements_selection.png
rename to diylc/diylc-swing/src/main/resources/images/elements_selection.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/error.png b/diylc/diylc-swing/src/main/resources/images/error.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/error.png
rename to diylc/diylc-swing/src/main/resources/images/error.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/excel.png b/diylc/diylc-swing/src/main/resources/images/excel.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/excel.png
rename to diylc/diylc-swing/src/main/resources/images/excel.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/exit.png b/diylc/diylc-swing/src/main/resources/images/exit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/exit.png
rename to diylc/diylc-swing/src/main/resources/images/exit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/export.png b/diylc/diylc-swing/src/main/resources/images/export.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/export.png
rename to diylc/diylc-swing/src/main/resources/images/export.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/eye.png b/diylc/diylc-swing/src/main/resources/images/eye.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/eye.png
rename to diylc/diylc-swing/src/main/resources/images/eye.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/faq.png b/diylc/diylc-swing/src/main/resources/images/faq.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/faq.png
rename to diylc/diylc-swing/src/main/resources/images/faq.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/find.png b/diylc/diylc-swing/src/main/resources/images/find.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/find.png
rename to diylc/diylc-swing/src/main/resources/images/find.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/fit_to_size.png b/diylc/diylc-swing/src/main/resources/images/fit_to_size.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/fit_to_size.png
rename to diylc/diylc-swing/src/main/resources/images/fit_to_size.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/flexible_leads.png b/diylc/diylc-swing/src/main/resources/images/flexible_leads.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/flexible_leads.png
rename to diylc/diylc-swing/src/main/resources/images/flexible_leads.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/flip_horizontal.png b/diylc/diylc-swing/src/main/resources/images/flip_horizontal.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/flip_horizontal.png
rename to diylc/diylc-swing/src/main/resources/images/flip_horizontal.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/flip_vertical.png b/diylc/diylc-swing/src/main/resources/images/flip_vertical.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/flip_vertical.png
rename to diylc/diylc-swing/src/main/resources/images/flip_vertical.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/folder_music.png b/diylc/diylc-swing/src/main/resources/images/folder_music.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/folder_music.png
rename to diylc/diylc-swing/src/main/resources/images/folder_music.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/folder_out.png b/diylc/diylc-swing/src/main/resources/images/folder_out.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/folder_out.png
rename to diylc/diylc-swing/src/main/resources/images/folder_out.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/forbidden.png b/diylc/diylc-swing/src/main/resources/images/forbidden.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/forbidden.png
rename to diylc/diylc-swing/src/main/resources/images/forbidden.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/form_blue.png b/diylc/diylc-swing/src/main/resources/images/form_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/form_blue.png
rename to diylc/diylc-swing/src/main/resources/images/form_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/form_blue_add.png b/diylc/diylc-swing/src/main/resources/images/form_blue_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/form_blue_add.png
rename to diylc/diylc-swing/src/main/resources/images/form_blue_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/front.png b/diylc/diylc-swing/src/main/resources/images/front.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/front.png
rename to diylc/diylc-swing/src/main/resources/images/front.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/garbage.png b/diylc/diylc-swing/src/main/resources/images/garbage.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/garbage.png
rename to diylc/diylc-swing/src/main/resources/images/garbage.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/gear.png b/diylc/diylc-swing/src/main/resources/images/gear.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/gear.png
rename to diylc/diylc-swing/src/main/resources/images/gear.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/gears.png b/diylc/diylc-swing/src/main/resources/images/gears.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/gears.png
rename to diylc/diylc-swing/src/main/resources/images/gears.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge.png b/diylc/diylc-swing/src/main/resources/images/graph_edge.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge.png
rename to diylc/diylc-swing/src/main/resources/images/graph_edge.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge_curved.png b/diylc/diylc-swing/src/main/resources/images/graph_edge_curved.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge_curved.png
rename to diylc/diylc-swing/src/main/resources/images/graph_edge_curved.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge_directed.png b/diylc/diylc-swing/src/main/resources/images/graph_edge_directed.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_edge_directed.png
rename to diylc/diylc-swing/src/main/resources/images/graph_edge_directed.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_nodes.png b/diylc/diylc-swing/src/main/resources/images/graph_nodes.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/graph_nodes.png
rename to diylc/diylc-swing/src/main/resources/images/graph_nodes.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/group.png b/diylc/diylc-swing/src/main/resources/images/group.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/group.png
rename to diylc/diylc-swing/src/main/resources/images/group.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/guitar.png b/diylc/diylc-swing/src/main/resources/images/guitar.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/guitar.png
rename to diylc/diylc-swing/src/main/resources/images/guitar.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/hammer.png b/diylc/diylc-swing/src/main/resources/images/hammer.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/hammer.png
rename to diylc/diylc-swing/src/main/resources/images/hammer.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/help2.png b/diylc/diylc-swing/src/main/resources/images/help2.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/help2.png
rename to diylc/diylc-swing/src/main/resources/images/help2.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/history.png b/diylc/diylc-swing/src/main/resources/images/history.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/history.png
rename to diylc/diylc-swing/src/main/resources/images/history.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/html.png b/diylc/diylc-swing/src/main/resources/images/html.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/html.png
rename to diylc/diylc-swing/src/main/resources/images/html.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_large.png b/diylc/diylc-swing/src/main/resources/images/icon_large.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_large.png
rename to diylc/diylc-swing/src/main/resources/images/icon_large.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_medium.png b/diylc/diylc-swing/src/main/resources/images/icon_medium.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_medium.png
rename to diylc/diylc-swing/src/main/resources/images/icon_medium.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_small.png b/diylc/diylc-swing/src/main/resources/images/icon_small.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/icon_small.png
rename to diylc/diylc-swing/src/main/resources/images/icon_small.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card.png b/diylc/diylc-swing/src/main/resources/images/id_card.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card.png
rename to diylc/diylc-swing/src/main/resources/images/id_card.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card_add.png b/diylc/diylc-swing/src/main/resources/images/id_card_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card_add.png
rename to diylc/diylc-swing/src/main/resources/images/id_card_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card_edit.png b/diylc/diylc-swing/src/main/resources/images/id_card_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/id_card_edit.png
rename to diylc/diylc-swing/src/main/resources/images/id_card_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/image.png b/diylc/diylc-swing/src/main/resources/images/image.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/image.png
rename to diylc/diylc-swing/src/main/resources/images/image.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/import_netlist.png b/diylc/diylc-swing/src/main/resources/images/import_netlist.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/import_netlist.png
rename to diylc/diylc-swing/src/main/resources/images/import_netlist.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/jar_bean_into.png b/diylc/diylc-swing/src/main/resources/images/jar_bean_into.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/jar_bean_into.png
rename to diylc/diylc-swing/src/main/resources/images/jar_bean_into.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/key_edit.png b/diylc/diylc-swing/src/main/resources/images/key_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/key_edit.png
rename to diylc/diylc-swing/src/main/resources/images/key_edit.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/laserpointer.png b/diylc/diylc-swing/src/main/resources/images/laserpointer.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/laserpointer.png
rename to diylc/diylc-swing/src/main/resources/images/laserpointer.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/lightbulb_off.png b/diylc/diylc-swing/src/main/resources/images/lightbulb_off.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/lightbulb_off.png
rename to diylc/diylc-swing/src/main/resources/images/lightbulb_off.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/lightbulb_on.png b/diylc/diylc-swing/src/main/resources/images/lightbulb_on.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/lightbulb_on.png
rename to diylc/diylc-swing/src/main/resources/images/lightbulb_on.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/loadline.png b/diylc/diylc-swing/src/main/resources/images/loadline.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/loadline.png
rename to diylc/diylc-swing/src/main/resources/images/loadline.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/loadline_add.png b/diylc/diylc-swing/src/main/resources/images/loadline_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/loadline_add.png
rename to diylc/diylc-swing/src/main/resources/images/loadline_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/lock.png b/diylc/diylc-swing/src/main/resources/images/lock.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/lock.png
rename to diylc/diylc-swing/src/main/resources/images/lock.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/lock_open.png b/diylc/diylc-swing/src/main/resources/images/lock_open.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/lock_open.png
rename to diylc/diylc-swing/src/main/resources/images/lock_open.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/magic_wand.png b/diylc/diylc-swing/src/main/resources/images/magic_wand.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/magic_wand.png
rename to diylc/diylc-swing/src/main/resources/images/magic_wand.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/manual.png b/diylc/diylc-swing/src/main/resources/images/manual.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/manual.png
rename to diylc/diylc-swing/src/main/resources/images/manual.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/media_play_green.png b/diylc/diylc-swing/src/main/resources/images/media_play_green.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/media_play_green.png
rename to diylc/diylc-swing/src/main/resources/images/media_play_green.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/media_stop_red.png b/diylc/diylc-swing/src/main/resources/images/media_stop_red.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/media_stop_red.png
rename to diylc/diylc-swing/src/main/resources/images/media_stop_red.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/megaphone.png b/diylc/diylc-swing/src/main/resources/images/megaphone.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/megaphone.png
rename to diylc/diylc-swing/src/main/resources/images/megaphone.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/messages.png b/diylc/diylc-swing/src/main/resources/images/messages.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/messages.png
rename to diylc/diylc-swing/src/main/resources/images/messages.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/missing_image.png b/diylc/diylc-swing/src/main/resources/images/missing_image.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/missing_image.png
rename to diylc/diylc-swing/src/main/resources/images/missing_image.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/move_small.png b/diylc/diylc-swing/src/main/resources/images/move_small.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/move_small.png
rename to diylc/diylc-swing/src/main/resources/images/move_small.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/nav_left_blue.png b/diylc/diylc-swing/src/main/resources/images/nav_left_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/nav_left_blue.png
rename to diylc/diylc-swing/src/main/resources/images/nav_left_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/nav_right_blue.png b/diylc/diylc-swing/src/main/resources/images/nav_right_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/nav_right_blue.png
rename to diylc/diylc-swing/src/main/resources/images/nav_right_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/navigate_check.png b/diylc/diylc-swing/src/main/resources/images/navigate_check.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/navigate_check.png
rename to diylc/diylc-swing/src/main/resources/images/navigate_check.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/navigate_plus.png b/diylc/diylc-swing/src/main/resources/images/navigate_plus.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/navigate_plus.png
rename to diylc/diylc-swing/src/main/resources/images/navigate_plus.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/node.png b/diylc/diylc-swing/src/main/resources/images/node.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/node.png
rename to diylc/diylc-swing/src/main/resources/images/node.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/notebook_add.png b/diylc/diylc-swing/src/main/resources/images/notebook_add.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/notebook_add.png
rename to diylc/diylc-swing/src/main/resources/images/notebook_add.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/pads.png b/diylc/diylc-swing/src/main/resources/images/pads.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/pads.png
rename to diylc/diylc-swing/src/main/resources/images/pads.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/paste.png b/diylc/diylc-swing/src/main/resources/images/paste.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/paste.png
rename to diylc/diylc-swing/src/main/resources/images/paste.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/pdf.png b/diylc/diylc-swing/src/main/resources/images/pdf.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/pdf.png
rename to diylc/diylc-swing/src/main/resources/images/pdf.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/pens.png b/diylc/diylc-swing/src/main/resources/images/pens.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/pens.png
rename to diylc/diylc-swing/src/main/resources/images/pens.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/photo_scenery.png b/diylc/diylc-swing/src/main/resources/images/photo_scenery.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/photo_scenery.png
rename to diylc/diylc-swing/src/main/resources/images/photo_scenery.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/pin_green.png b/diylc/diylc-swing/src/main/resources/images/pin_green.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/pin_green.png
rename to diylc/diylc-swing/src/main/resources/images/pin_green.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/pin_grey.png b/diylc/diylc-swing/src/main/resources/images/pin_grey.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/pin_grey.png
rename to diylc/diylc-swing/src/main/resources/images/pin_grey.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/plugin.png b/diylc/diylc-swing/src/main/resources/images/plugin.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/plugin.png
rename to diylc/diylc-swing/src/main/resources/images/plugin.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/print.png b/diylc/diylc-swing/src/main/resources/images/print.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/print.png
rename to diylc/diylc-swing/src/main/resources/images/print.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/redo.png b/diylc/diylc-swing/src/main/resources/images/redo.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/redo.png
rename to diylc/diylc-swing/src/main/resources/images/redo.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/refresh.png b/diylc/diylc-swing/src/main/resources/images/refresh.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/refresh.png
rename to diylc/diylc-swing/src/main/resources/images/refresh.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/rotate_ccw.png b/diylc/diylc-swing/src/main/resources/images/rotate_ccw.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/rotate_ccw.png
rename to diylc/diylc-swing/src/main/resources/images/rotate_ccw.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/rotate_cw.png b/diylc/diylc-swing/src/main/resources/images/rotate_cw.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/rotate_cw.png
rename to diylc/diylc-swing/src/main/resources/images/rotate_cw.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/save_as.png b/diylc/diylc-swing/src/main/resources/images/save_as.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/save_as.png
rename to diylc/diylc-swing/src/main/resources/images/save_as.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/scientist.png b/diylc/diylc-swing/src/main/resources/images/scientist.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/scientist.png
rename to diylc/diylc-swing/src/main/resources/images/scientist.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/screwdriver.png b/diylc/diylc-swing/src/main/resources/images/screwdriver.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/screwdriver.png
rename to diylc/diylc-swing/src/main/resources/images/screwdriver.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/scroll_information.png b/diylc/diylc-swing/src/main/resources/images/scroll_information.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/scroll_information.png
rename to diylc/diylc-swing/src/main/resources/images/scroll_information.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/search-box.png b/diylc/diylc-swing/src/main/resources/images/search-box.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/search-box.png
rename to diylc/diylc-swing/src/main/resources/images/search-box.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/selection.png b/diylc/diylc-swing/src/main/resources/images/selection.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/selection.png
rename to diylc/diylc-swing/src/main/resources/images/selection.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/size.png b/diylc/diylc-swing/src/main/resources/images/size.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/size.png
rename to diylc/diylc-swing/src/main/resources/images/size.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_components.png b/diylc/diylc-swing/src/main/resources/images/snap_to_components.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_components.png
rename to diylc/diylc-swing/src/main/resources/images/snap_to_components.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_grid.png b/diylc/diylc-swing/src/main/resources/images/snap_to_grid.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_grid.png
rename to diylc/diylc-swing/src/main/resources/images/snap_to_grid.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_none.png b/diylc/diylc-swing/src/main/resources/images/snap_to_none.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/snap_to_none.png
rename to diylc/diylc-swing/src/main/resources/images/snap_to_none.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/sort.png b/diylc/diylc-swing/src/main/resources/images/sort.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/sort.png
rename to diylc/diylc-swing/src/main/resources/images/sort.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/spinning.gif b/diylc/diylc-swing/src/main/resources/images/spinning.gif
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/spinning.gif
rename to diylc/diylc-swing/src/main/resources/images/spinning.gif
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash.png b/diylc/diylc-swing/src/main/resources/images/splash.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash.png
rename to diylc/diylc-swing/src/main/resources/images/splash.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_ceramic.png b/diylc/diylc-swing/src/main/resources/images/splash_ceramic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_ceramic.png
rename to diylc/diylc-swing/src/main/resources/images/splash_ceramic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_electrolytic.png b/diylc/diylc-swing/src/main/resources/images/splash_electrolytic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_electrolytic.png
rename to diylc/diylc-swing/src/main/resources/images/splash_electrolytic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_film.png b/diylc/diylc-swing/src/main/resources/images/splash_film.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_film.png
rename to diylc/diylc-swing/src/main/resources/images/splash_film.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_ic.png b/diylc/diylc-swing/src/main/resources/images/splash_ic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_ic.png
rename to diylc/diylc-swing/src/main/resources/images/splash_ic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_resistor.png b/diylc/diylc-swing/src/main/resources/images/splash_resistor.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/splash_resistor.png
rename to diylc/diylc-swing/src/main/resources/images/splash_resistor.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_blue.png b/diylc/diylc-swing/src/main/resources/images/star_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_blue.png
rename to diylc/diylc-swing/src/main/resources/images/star_blue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_grey.png b/diylc/diylc-swing/src/main/resources/images/star_grey.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_grey.png
rename to diylc/diylc-swing/src/main/resources/images/star_grey.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_yellow.png b/diylc/diylc-swing/src/main/resources/images/star_yellow.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/star_yellow.png
rename to diylc/diylc-swing/src/main/resources/images/star_yellow.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/tape_measure1.png b/diylc/diylc-swing/src/main/resources/images/tape_measure1.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/tape_measure1.png
rename to diylc/diylc-swing/src/main/resources/images/tape_measure1.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/trace_mask.png b/diylc/diylc-swing/src/main/resources/images/trace_mask.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/trace_mask.png
rename to diylc/diylc-swing/src/main/resources/images/trace_mask.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/trace_proximity.png b/diylc/diylc-swing/src/main/resources/images/trace_proximity.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/trace_proximity.png
rename to diylc/diylc-swing/src/main/resources/images/trace_proximity.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/undo.png b/diylc/diylc-swing/src/main/resources/images/undo.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/undo.png
rename to diylc/diylc-swing/src/main/resources/images/undo.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/ungroup.png b/diylc/diylc-swing/src/main/resources/images/ungroup.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/ungroup.png
rename to diylc/diylc-swing/src/main/resources/images/ungroup.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/upload.png b/diylc/diylc-swing/src/main/resources/images/upload.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/upload.png
rename to diylc/diylc-swing/src/main/resources/images/upload.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/user1.png b/diylc/diylc-swing/src/main/resources/images/user1.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/user1.png
rename to diylc/diylc-swing/src/main/resources/images/user1.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/view.png b/diylc/diylc-swing/src/main/resources/images/view.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/view.png
rename to diylc/diylc-swing/src/main/resources/images/view.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/warning.png b/diylc/diylc-swing/src/main/resources/images/warning.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/warning.png
rename to diylc/diylc-swing/src/main/resources/images/warning.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/web.png b/diylc/diylc-swing/src/main/resources/images/web.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/web.png
rename to diylc/diylc-swing/src/main/resources/images/web.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/window_colors.png b/diylc/diylc-swing/src/main/resources/images/window_colors.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/window_colors.png
rename to diylc/diylc-swing/src/main/resources/images/window_colors.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/wrench.png b/diylc/diylc-swing/src/main/resources/images/wrench.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/wrench.png
rename to diylc/diylc-swing/src/main/resources/images/wrench.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_in.png b/diylc/diylc-swing/src/main/resources/images/zoom_in.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_in.png
rename to diylc/diylc-swing/src/main/resources/images/zoom_in.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_out.png b/diylc/diylc-swing/src/main/resources/images/zoom_out.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_out.png
rename to diylc/diylc-swing/src/main/resources/images/zoom_out.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_small.png b/diylc/diylc-swing/src/main/resources/images/zoom_small.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/zoom_small.png
rename to diylc/diylc-swing/src/main/resources/images/zoom_small.png