diff --git a/diylc/diylc-core/src/org/diylc/images/IconLoader.java b/diylc/diylc-core/src/org/diylc/core/images/IconLoader.java
similarity index 97%
rename from diylc/diylc-core/src/org/diylc/images/IconLoader.java
rename to diylc/diylc-core/src/org/diylc/core/images/IconLoader.java
index 2002e495..b5179366 100644
--- a/diylc/diylc-core/src/org/diylc/images/IconLoader.java
+++ b/diylc/diylc-core/src/org/diylc/core/images/IconLoader.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.images;
+package org.diylc.core.images;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/diylc/diylc-core/src/org/diylc/images/about.png b/diylc/diylc-core/src/org/diylc/core/images/about.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/about.png
rename to diylc/diylc-core/src/org/diylc/core/images/about.png
diff --git a/diylc/diylc-core/src/org/diylc/images/add.png b/diylc/diylc-core/src/org/diylc/core/images/add.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/add.png
rename to diylc/diylc-core/src/org/diylc/core/images/add.png
diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_down_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_down_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/arrow_down_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/arrow_down_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_left_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_left_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/arrow_left_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/arrow_left_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_right_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_right_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/arrow_right_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/arrow_right_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/arrow_up_blue.png b/diylc/diylc-core/src/org/diylc/core/images/arrow_up_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/arrow_up_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/arrow_up_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/at.png b/diylc/diylc-core/src/org/diylc/core/images/at.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/at.png
rename to diylc/diylc-core/src/org/diylc/core/images/at.png
diff --git a/diylc/diylc-core/src/org/diylc/images/back.png b/diylc/diylc-core/src/org/diylc/core/images/back.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/back.png
rename to diylc/diylc-core/src/org/diylc/core/images/back.png
diff --git a/diylc/diylc-core/src/org/diylc/images/blackboard.png b/diylc/diylc-core/src/org/diylc/core/images/blackboard.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/blackboard.png
rename to diylc/diylc-core/src/org/diylc/core/images/blackboard.png
diff --git a/diylc/diylc-core/src/org/diylc/images/bom.png b/diylc/diylc-core/src/org/diylc/core/images/bom.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/bom.png
rename to diylc/diylc-core/src/org/diylc/core/images/bom.png
diff --git a/diylc/diylc-core/src/org/diylc/images/bug.png b/diylc/diylc-core/src/org/diylc/core/images/bug.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/bug.png
rename to diylc/diylc-core/src/org/diylc/core/images/bug.png
diff --git a/diylc/diylc-core/src/org/diylc/images/check.png b/diylc/diylc-core/src/org/diylc/core/images/check.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/check.png
rename to diylc/diylc-core/src/org/diylc/core/images/check.png
diff --git a/diylc/diylc-core/src/org/diylc/images/chest.png b/diylc/diylc-core/src/org/diylc/core/images/chest.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/chest.png
rename to diylc/diylc-core/src/org/diylc/core/images/chest.png
diff --git a/diylc/diylc-core/src/org/diylc/images/component.png b/diylc/diylc-core/src/org/diylc/core/images/component.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/component.png
rename to diylc/diylc-core/src/org/diylc/core/images/component.png
diff --git a/diylc/diylc-core/src/org/diylc/images/copy.png b/diylc/diylc-core/src/org/diylc/core/images/copy.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/copy.png
rename to diylc/diylc-core/src/org/diylc/core/images/copy.png
diff --git a/diylc/diylc-core/src/org/diylc/images/csv.png b/diylc/diylc-core/src/org/diylc/core/images/csv.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/csv.png
rename to diylc/diylc-core/src/org/diylc/core/images/csv.png
diff --git a/diylc/diylc-core/src/org/diylc/images/cut.png b/diylc/diylc-core/src/org/diylc/core/images/cut.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/cut.png
rename to diylc/diylc-core/src/org/diylc/core/images/cut.png
diff --git a/diylc/diylc-core/src/org/diylc/images/delete.png b/diylc/diylc-core/src/org/diylc/core/images/delete.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/delete.png
rename to diylc/diylc-core/src/org/diylc/core/images/delete.png
diff --git a/diylc/diylc-core/src/org/diylc/images/disk_blue.png b/diylc/diylc-core/src/org/diylc/core/images/disk_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/disk_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/disk_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/disks.png b/diylc/diylc-core/src/org/diylc/core/images/disks.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/disks.png
rename to diylc/diylc-core/src/org/diylc/core/images/disks.png
diff --git a/diylc/diylc-core/src/org/diylc/images/document.png b/diylc/diylc-core/src/org/diylc/core/images/document.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/document.png
rename to diylc/diylc-core/src/org/diylc/core/images/document.png
diff --git a/diylc/diylc-core/src/org/diylc/images/document_edit.png b/diylc/diylc-core/src/org/diylc/core/images/document_edit.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/document_edit.png
rename to diylc/diylc-core/src/org/diylc/core/images/document_edit.png
diff --git a/diylc/diylc-core/src/org/diylc/images/document_info.png b/diylc/diylc-core/src/org/diylc/core/images/document_info.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/document_info.png
rename to diylc/diylc-core/src/org/diylc/core/images/document_info.png
diff --git a/diylc/diylc-core/src/org/diylc/images/document_plain_yellow.png b/diylc/diylc-core/src/org/diylc/core/images/document_plain_yellow.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/document_plain_yellow.png
rename to diylc/diylc-core/src/org/diylc/core/images/document_plain_yellow.png
diff --git a/diylc/diylc-core/src/org/diylc/images/donate.gif b/diylc/diylc-core/src/org/diylc/core/images/donate.gif
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/donate.gif
rename to diylc/diylc-core/src/org/diylc/core/images/donate.gif
diff --git a/diylc/diylc-core/src/org/diylc/images/donate.png b/diylc/diylc-core/src/org/diylc/core/images/donate.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/donate.png
rename to diylc/diylc-core/src/org/diylc/core/images/donate.png
diff --git a/diylc/diylc-core/src/org/diylc/images/edit.png b/diylc/diylc-core/src/org/diylc/core/images/edit.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/edit.png
rename to diylc/diylc-core/src/org/diylc/core/images/edit.png
diff --git a/diylc/diylc-core/src/org/diylc/images/edit_component.png b/diylc/diylc-core/src/org/diylc/core/images/edit_component.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/edit_component.png
rename to diylc/diylc-core/src/org/diylc/core/images/edit_component.png
diff --git a/diylc/diylc-core/src/org/diylc/images/elements_selection.png b/diylc/diylc-core/src/org/diylc/core/images/elements_selection.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/elements_selection.png
rename to diylc/diylc-core/src/org/diylc/core/images/elements_selection.png
diff --git a/diylc/diylc-core/src/org/diylc/images/error.png b/diylc/diylc-core/src/org/diylc/core/images/error.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/error.png
rename to diylc/diylc-core/src/org/diylc/core/images/error.png
diff --git a/diylc/diylc-core/src/org/diylc/images/excel.png b/diylc/diylc-core/src/org/diylc/core/images/excel.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/excel.png
rename to diylc/diylc-core/src/org/diylc/core/images/excel.png
diff --git a/diylc/diylc-core/src/org/diylc/images/exit.png b/diylc/diylc-core/src/org/diylc/core/images/exit.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/exit.png
rename to diylc/diylc-core/src/org/diylc/core/images/exit.png
diff --git a/diylc/diylc-core/src/org/diylc/images/export.png b/diylc/diylc-core/src/org/diylc/core/images/export.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/export.png
rename to diylc/diylc-core/src/org/diylc/core/images/export.png
diff --git a/diylc/diylc-core/src/org/diylc/images/faq.png b/diylc/diylc-core/src/org/diylc/core/images/faq.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/faq.png
rename to diylc/diylc-core/src/org/diylc/core/images/faq.png
diff --git a/diylc/diylc-core/src/org/diylc/images/folder_music.png b/diylc/diylc-core/src/org/diylc/core/images/folder_music.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/folder_music.png
rename to diylc/diylc-core/src/org/diylc/core/images/folder_music.png
diff --git a/diylc/diylc-core/src/org/diylc/images/folder_out.png b/diylc/diylc-core/src/org/diylc/core/images/folder_out.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/folder_out.png
rename to diylc/diylc-core/src/org/diylc/core/images/folder_out.png
diff --git a/diylc/diylc-core/src/org/diylc/images/forbidden.png b/diylc/diylc-core/src/org/diylc/core/images/forbidden.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/forbidden.png
rename to diylc/diylc-core/src/org/diylc/core/images/forbidden.png
diff --git a/diylc/diylc-core/src/org/diylc/images/form_blue.png b/diylc/diylc-core/src/org/diylc/core/images/form_blue.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/form_blue.png
rename to diylc/diylc-core/src/org/diylc/core/images/form_blue.png
diff --git a/diylc/diylc-core/src/org/diylc/images/form_blue_add.png b/diylc/diylc-core/src/org/diylc/core/images/form_blue_add.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/form_blue_add.png
rename to diylc/diylc-core/src/org/diylc/core/images/form_blue_add.png
diff --git a/diylc/diylc-core/src/org/diylc/images/front.png b/diylc/diylc-core/src/org/diylc/core/images/front.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/front.png
rename to diylc/diylc-core/src/org/diylc/core/images/front.png
diff --git a/diylc/diylc-core/src/org/diylc/images/garbage.png b/diylc/diylc-core/src/org/diylc/core/images/garbage.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/garbage.png
rename to diylc/diylc-core/src/org/diylc/core/images/garbage.png
diff --git a/diylc/diylc-core/src/org/diylc/images/gear.png b/diylc/diylc-core/src/org/diylc/core/images/gear.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/gear.png
rename to diylc/diylc-core/src/org/diylc/core/images/gear.png
diff --git a/diylc/diylc-core/src/org/diylc/images/gears.png b/diylc/diylc-core/src/org/diylc/core/images/gears.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/gears.png
rename to diylc/diylc-core/src/org/diylc/core/images/gears.png
diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/graph_edge.png
rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge.png
diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge_curved.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge_curved.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/graph_edge_curved.png
rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge_curved.png
diff --git a/diylc/diylc-core/src/org/diylc/images/graph_edge_directed.png b/diylc/diylc-core/src/org/diylc/core/images/graph_edge_directed.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/graph_edge_directed.png
rename to diylc/diylc-core/src/org/diylc/core/images/graph_edge_directed.png
diff --git a/diylc/diylc-core/src/org/diylc/images/group.png b/diylc/diylc-core/src/org/diylc/core/images/group.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/group.png
rename to diylc/diylc-core/src/org/diylc/core/images/group.png
diff --git a/diylc/diylc-core/src/org/diylc/images/html.png b/diylc/diylc-core/src/org/diylc/core/images/html.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/html.png
rename to diylc/diylc-core/src/org/diylc/core/images/html.png
diff --git a/diylc/diylc-core/src/org/diylc/images/icon_large.png b/diylc/diylc-core/src/org/diylc/core/images/icon_large.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/icon_large.png
rename to diylc/diylc-core/src/org/diylc/core/images/icon_large.png
diff --git a/diylc/diylc-core/src/org/diylc/images/icon_medium.png b/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/icon_medium.png
rename to diylc/diylc-core/src/org/diylc/core/images/icon_medium.png
diff --git a/diylc/diylc-core/src/org/diylc/images/icon_small.png b/diylc/diylc-core/src/org/diylc/core/images/icon_small.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/icon_small.png
rename to diylc/diylc-core/src/org/diylc/core/images/icon_small.png
diff --git a/diylc/diylc-core/src/org/diylc/images/id_card.png b/diylc/diylc-core/src/org/diylc/core/images/id_card.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/id_card.png
rename to diylc/diylc-core/src/org/diylc/core/images/id_card.png
diff --git a/diylc/diylc-core/src/org/diylc/images/id_card_add.png b/diylc/diylc-core/src/org/diylc/core/images/id_card_add.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/id_card_add.png
rename to diylc/diylc-core/src/org/diylc/core/images/id_card_add.png
diff --git a/diylc/diylc-core/src/org/diylc/images/image.png b/diylc/diylc-core/src/org/diylc/core/images/image.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/image.png
rename to diylc/diylc-core/src/org/diylc/core/images/image.png
diff --git a/diylc/diylc-core/src/org/diylc/images/lightbulb_off.png b/diylc/diylc-core/src/org/diylc/core/images/lightbulb_off.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/lightbulb_off.png
rename to diylc/diylc-core/src/org/diylc/core/images/lightbulb_off.png
diff --git a/diylc/diylc-core/src/org/diylc/images/lightbulb_on.png b/diylc/diylc-core/src/org/diylc/core/images/lightbulb_on.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/lightbulb_on.png
rename to diylc/diylc-core/src/org/diylc/core/images/lightbulb_on.png
diff --git a/diylc/diylc-core/src/org/diylc/images/manual.png b/diylc/diylc-core/src/org/diylc/core/images/manual.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/manual.png
rename to diylc/diylc-core/src/org/diylc/core/images/manual.png
diff --git a/diylc/diylc-core/src/org/diylc/images/media_play_green.png b/diylc/diylc-core/src/org/diylc/core/images/media_play_green.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/media_play_green.png
rename to diylc/diylc-core/src/org/diylc/core/images/media_play_green.png
diff --git a/diylc/diylc-core/src/org/diylc/images/media_stop_red.png b/diylc/diylc-core/src/org/diylc/core/images/media_stop_red.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/media_stop_red.png
rename to diylc/diylc-core/src/org/diylc/core/images/media_stop_red.png
diff --git a/diylc/diylc-core/src/org/diylc/images/move_small.png b/diylc/diylc-core/src/org/diylc/core/images/move_small.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/move_small.png
rename to diylc/diylc-core/src/org/diylc/core/images/move_small.png
diff --git a/diylc/diylc-core/src/org/diylc/images/navigate_check.png b/diylc/diylc-core/src/org/diylc/core/images/navigate_check.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/navigate_check.png
rename to diylc/diylc-core/src/org/diylc/core/images/navigate_check.png
diff --git a/diylc/diylc-core/src/org/diylc/images/navigate_plus.png b/diylc/diylc-core/src/org/diylc/core/images/navigate_plus.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/navigate_plus.png
rename to diylc/diylc-core/src/org/diylc/core/images/navigate_plus.png
diff --git a/diylc/diylc-core/src/org/diylc/images/notebook_add.png b/diylc/diylc-core/src/org/diylc/core/images/notebook_add.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/notebook_add.png
rename to diylc/diylc-core/src/org/diylc/core/images/notebook_add.png
diff --git a/diylc/diylc-core/src/org/diylc/images/paste.png b/diylc/diylc-core/src/org/diylc/core/images/paste.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/paste.png
rename to diylc/diylc-core/src/org/diylc/core/images/paste.png
diff --git a/diylc/diylc-core/src/org/diylc/images/pdf.png b/diylc/diylc-core/src/org/diylc/core/images/pdf.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/pdf.png
rename to diylc/diylc-core/src/org/diylc/core/images/pdf.png
diff --git a/diylc/diylc-core/src/org/diylc/images/pens.png b/diylc/diylc-core/src/org/diylc/core/images/pens.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/pens.png
rename to diylc/diylc-core/src/org/diylc/core/images/pens.png
diff --git a/diylc/diylc-core/src/org/diylc/images/photo_scenery.png b/diylc/diylc-core/src/org/diylc/core/images/photo_scenery.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/photo_scenery.png
rename to diylc/diylc-core/src/org/diylc/core/images/photo_scenery.png
diff --git a/diylc/diylc-core/src/org/diylc/images/plugin.png b/diylc/diylc-core/src/org/diylc/core/images/plugin.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/plugin.png
rename to diylc/diylc-core/src/org/diylc/core/images/plugin.png
diff --git a/diylc/diylc-core/src/org/diylc/images/print.png b/diylc/diylc-core/src/org/diylc/core/images/print.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/print.png
rename to diylc/diylc-core/src/org/diylc/core/images/print.png
diff --git a/diylc/diylc-core/src/org/diylc/images/redo.png b/diylc/diylc-core/src/org/diylc/core/images/redo.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/redo.png
rename to diylc/diylc-core/src/org/diylc/core/images/redo.png
diff --git a/diylc/diylc-core/src/org/diylc/images/refresh.png b/diylc/diylc-core/src/org/diylc/core/images/refresh.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/refresh.png
rename to diylc/diylc-core/src/org/diylc/core/images/refresh.png
diff --git a/diylc/diylc-core/src/org/diylc/images/save_as.png b/diylc/diylc-core/src/org/diylc/core/images/save_as.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/save_as.png
rename to diylc/diylc-core/src/org/diylc/core/images/save_as.png
diff --git a/diylc/diylc-core/src/org/diylc/images/selection.png b/diylc/diylc-core/src/org/diylc/core/images/selection.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/selection.png
rename to diylc/diylc-core/src/org/diylc/core/images/selection.png
diff --git a/diylc/diylc-core/src/org/diylc/images/size.png b/diylc/diylc-core/src/org/diylc/core/images/size.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/size.png
rename to diylc/diylc-core/src/org/diylc/core/images/size.png
diff --git a/diylc/diylc-core/src/org/diylc/images/sort.png b/diylc/diylc-core/src/org/diylc/core/images/sort.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/sort.png
rename to diylc/diylc-core/src/org/diylc/core/images/sort.png
diff --git a/diylc/diylc-core/src/org/diylc/images/trace_mask.png b/diylc/diylc-core/src/org/diylc/core/images/trace_mask.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/trace_mask.png
rename to diylc/diylc-core/src/org/diylc/core/images/trace_mask.png
diff --git a/diylc/diylc-core/src/org/diylc/images/undo.png b/diylc/diylc-core/src/org/diylc/core/images/undo.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/undo.png
rename to diylc/diylc-core/src/org/diylc/core/images/undo.png
diff --git a/diylc/diylc-core/src/org/diylc/images/ungroup.png b/diylc/diylc-core/src/org/diylc/core/images/ungroup.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/ungroup.png
rename to diylc/diylc-core/src/org/diylc/core/images/ungroup.png
diff --git a/diylc/diylc-core/src/org/diylc/images/upload.png b/diylc/diylc-core/src/org/diylc/core/images/upload.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/upload.png
rename to diylc/diylc-core/src/org/diylc/core/images/upload.png
diff --git a/diylc/diylc-core/src/org/diylc/images/view.png b/diylc/diylc-core/src/org/diylc/core/images/view.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/view.png
rename to diylc/diylc-core/src/org/diylc/core/images/view.png
diff --git a/diylc/diylc-core/src/org/diylc/images/warning.png b/diylc/diylc-core/src/org/diylc/core/images/warning.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/warning.png
rename to diylc/diylc-core/src/org/diylc/core/images/warning.png
diff --git a/diylc/diylc-core/src/org/diylc/images/window_colors.png b/diylc/diylc-core/src/org/diylc/core/images/window_colors.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/window_colors.png
rename to diylc/diylc-core/src/org/diylc/core/images/window_colors.png
diff --git a/diylc/diylc-core/src/org/diylc/images/wrench.png b/diylc/diylc-core/src/org/diylc/core/images/wrench.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/wrench.png
rename to diylc/diylc-core/src/org/diylc/core/images/wrench.png
diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_in.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_in.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/zoom_in.png
rename to diylc/diylc-core/src/org/diylc/core/images/zoom_in.png
diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_out.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_out.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/zoom_out.png
rename to diylc/diylc-core/src/org/diylc/core/images/zoom_out.png
diff --git a/diylc/diylc-core/src/org/diylc/images/zoom_small.png b/diylc/diylc-core/src/org/diylc/core/images/zoom_small.png
similarity index 100%
rename from diylc/diylc-core/src/org/diylc/images/zoom_small.png
rename to diylc/diylc-core/src/org/diylc/core/images/zoom_small.png
diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml
index e3bdce27..975952f2 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/update.xml
+++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml
@@ -3230,6 +3230,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>macOS: added meta +/- keyboard shortcuts for zooming</description>
 				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>macOS Sierra: the app starts and immediately stops on some older mac systems</description>
+				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>Favorites on building blocks show up as "null"</description>
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 2f45ffe3..39a1b732 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 2f45ffe3..39a1b732 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 48eccd84..de1ab583 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCSplash.java b/diylc/diylc-swing/src/org/diylc/DIYLCSplash.java
index ad27824d..f618115e 100644
--- a/diylc/diylc-swing/src/org/diylc/DIYLCSplash.java
+++ b/diylc/diylc-swing/src/org/diylc/DIYLCSplash.java
@@ -10,7 +10,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 
 /**
  * Custom splash screen with animated components. Does not use standard SplashScreen because of issues with OS X and Java 8.
diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index b4790126..e41c1d91 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -63,11 +63,11 @@ import org.diylc.core.IView;
 import org.diylc.core.Project;
 import org.diylc.core.Template;
 import org.diylc.core.Theme;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.core.measures.Nudge;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.editor.FlexibleLeadsEditor;
-import org.diylc.images.IconLoader;
 import org.diylc.netlist.Group;
 import org.diylc.netlist.Netlist;
 import org.diylc.netlist.Summary;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/InfoDialog.java b/diylc/diylc-swing/src/org/diylc/swing/gui/InfoDialog.java
index 7ba096c2..e2ee1f5f 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/InfoDialog.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/InfoDialog.java
@@ -28,7 +28,7 @@ import javax.swing.JLabel;
 
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.swingframework.ButtonDialog;
 
 public class InfoDialog extends ButtonDialog {
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
index 83cf48fb..b884b6ce 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
@@ -67,7 +67,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.core.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.IDynamicSubmenuHandler;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/actionbar/ActionBarPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
index 35c86f1d..e7a6a9d0 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
@@ -39,7 +39,7 @@ import org.diylc.common.EventType;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
diff --git a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java b/diylc/diylc-swing/src/org/diylc/swing/images/IconLoader.java
similarity index 98%
rename from diylc/diylc-swing/src/org/diylc/images/IconLoader.java
rename to diylc/diylc-swing/src/org/diylc/swing/images/IconLoader.java
index 56391f55..8f53fba3 100644
--- a/diylc/diylc-swing/src/org/diylc/images/IconLoader.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/images/IconLoader.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.images;
+package org.diylc.swing.images;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/diylc/diylc-swing/src/org/diylc/images/about.png b/diylc/diylc-swing/src/org/diylc/swing/images/about.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/about.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/about.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/add.png b/diylc/diylc-swing/src/org/diylc/swing/images/add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/application_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/application_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/application_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/application_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/arrow.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_down_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_down_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/arrow_down_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_down_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_left_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_left_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/arrow_left_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_left_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_right_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_right_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/arrow_right_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_right_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/arrow_up_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/arrow_up_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/arrow_up_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/arrow_up_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/at.png b/diylc/diylc-swing/src/org/diylc/swing/images/at.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/at.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/at.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/back.png b/diylc/diylc-swing/src/org/diylc/swing/images/back.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/back.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/back.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/blackboard.png b/diylc/diylc-swing/src/org/diylc/swing/images/blackboard.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/blackboard.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/blackboard.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/bom.png b/diylc/diylc-swing/src/org/diylc/swing/images/bom.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/bom.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/bom.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/branch_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/branch_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/branch_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/branch_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/briefcase_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/briefcase_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/briefcase_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/briefcase_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/briefcase_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/briefcase_into.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/briefcase_into.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/briefcase_into.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/bug.png b/diylc/diylc-swing/src/org/diylc/swing/images/bug.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/bug.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/bug.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/check.png b/diylc/diylc-swing/src/org/diylc/swing/images/check.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/check.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/check.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/chest.png b/diylc/diylc-swing/src/org/diylc/swing/images/chest.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/chest.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/chest.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_bg.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_bg.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_bg.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_bg.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_big.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_big.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_big.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_big.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_delete.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_delete.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_delete.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_delete.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_download.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_download.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_download.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_download.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_gear.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_gear.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_gear.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_up.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_up.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_up.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_up.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_upload.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_upload.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_upload.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_upload.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cloud_wait.png b/diylc/diylc-swing/src/org/diylc/swing/images/cloud_wait.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cloud_wait.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cloud_wait.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/coffeebean_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/coffeebean_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/coffeebean_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/coffeebean_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/component.png b/diylc/diylc-swing/src/org/diylc/swing/images/component.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/component.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/component.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/component_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/component_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/component_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/component_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/copy.png b/diylc/diylc-swing/src/org/diylc/swing/images/copy.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/copy.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/copy.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/csv.png b/diylc/diylc-swing/src/org/diylc/swing/images/csv.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/csv.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/csv.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/cut.png b/diylc/diylc-swing/src/org/diylc/swing/images/cut.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/cut.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/cut.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/dashboard.png b/diylc/diylc-swing/src/org/diylc/swing/images/dashboard.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/dashboard.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/dashboard.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/data_find.png b/diylc/diylc-swing/src/org/diylc/swing/images/data_find.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/data_find.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/data_find.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/delete.png b/diylc/diylc-swing/src/org/diylc/swing/images/delete.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/delete.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/delete.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/disk_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/disk_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/disk_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/disk_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/disks.png b/diylc/diylc-swing/src/org/diylc/swing/images/disks.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/disks.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/disks.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/document.png b/diylc/diylc-swing/src/org/diylc/swing/images/document.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/document.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/document.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/document_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/document_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/document_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/document_info.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_info.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/document_info.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/document_info.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/document_plain.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_plain.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/document_plain.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/document_plain.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/document_plain_yellow.png b/diylc/diylc-swing/src/org/diylc/swing/images/document_plain_yellow.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/document_plain_yellow.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/document_plain_yellow.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/documents_gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/documents_gear.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/documents_gear.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/documents_gear.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/donate.gif b/diylc/diylc-swing/src/org/diylc/swing/images/donate.gif
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/donate.gif
rename to diylc/diylc-swing/src/org/diylc/swing/images/donate.gif
diff --git a/diylc/diylc-swing/src/org/diylc/images/donate.png b/diylc/diylc-swing/src/org/diylc/swing/images/donate.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/donate.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/donate.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/download.png b/diylc/diylc-swing/src/org/diylc/swing/images/download.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/download.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/download.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/earth.png b/diylc/diylc-swing/src/org/diylc/swing/images/earth.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/earth.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/earth.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/edit_component.png b/diylc/diylc-swing/src/org/diylc/swing/images/edit_component.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/edit_component.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/edit_component.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/element_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/element_into.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/element_into.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/element_into.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/elements1.png b/diylc/diylc-swing/src/org/diylc/swing/images/elements1.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/elements1.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/elements1.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/elements_selection.png b/diylc/diylc-swing/src/org/diylc/swing/images/elements_selection.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/elements_selection.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/elements_selection.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/error.png b/diylc/diylc-swing/src/org/diylc/swing/images/error.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/error.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/error.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/excel.png b/diylc/diylc-swing/src/org/diylc/swing/images/excel.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/excel.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/excel.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/exit.png b/diylc/diylc-swing/src/org/diylc/swing/images/exit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/exit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/exit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/export.png b/diylc/diylc-swing/src/org/diylc/swing/images/export.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/export.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/export.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/eye.png b/diylc/diylc-swing/src/org/diylc/swing/images/eye.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/eye.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/eye.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/faq.png b/diylc/diylc-swing/src/org/diylc/swing/images/faq.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/faq.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/faq.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/find.png b/diylc/diylc-swing/src/org/diylc/swing/images/find.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/find.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/find.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/fit_to_size.png b/diylc/diylc-swing/src/org/diylc/swing/images/fit_to_size.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/fit_to_size.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/fit_to_size.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/flexible_leads.png b/diylc/diylc-swing/src/org/diylc/swing/images/flexible_leads.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/flexible_leads.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/flexible_leads.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/flip_horizontal.png b/diylc/diylc-swing/src/org/diylc/swing/images/flip_horizontal.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/flip_horizontal.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/flip_horizontal.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/flip_vertical.png b/diylc/diylc-swing/src/org/diylc/swing/images/flip_vertical.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/flip_vertical.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/flip_vertical.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/folder_music.png b/diylc/diylc-swing/src/org/diylc/swing/images/folder_music.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/folder_music.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/folder_music.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/folder_out.png b/diylc/diylc-swing/src/org/diylc/swing/images/folder_out.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/folder_out.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/folder_out.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/forbidden.png b/diylc/diylc-swing/src/org/diylc/swing/images/forbidden.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/forbidden.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/forbidden.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/form_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/form_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/form_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/form_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/form_blue_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/form_blue_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/form_blue_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/form_blue_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/front.png b/diylc/diylc-swing/src/org/diylc/swing/images/front.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/front.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/front.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/garbage.png b/diylc/diylc-swing/src/org/diylc/swing/images/garbage.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/garbage.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/garbage.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/gear.png b/diylc/diylc-swing/src/org/diylc/swing/images/gear.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/gear.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/gear.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/gears.png b/diylc/diylc-swing/src/org/diylc/swing/images/gears.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/gears.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/gears.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/graph_edge.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge_curved.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_curved.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/graph_edge_curved.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_curved.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_edge_directed.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_directed.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/graph_edge_directed.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_edge_directed.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/graph_nodes.png b/diylc/diylc-swing/src/org/diylc/swing/images/graph_nodes.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/graph_nodes.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/graph_nodes.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/group.png b/diylc/diylc-swing/src/org/diylc/swing/images/group.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/group.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/group.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/guitar.png b/diylc/diylc-swing/src/org/diylc/swing/images/guitar.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/guitar.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/guitar.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/hammer.png b/diylc/diylc-swing/src/org/diylc/swing/images/hammer.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/hammer.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/hammer.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/help2.png b/diylc/diylc-swing/src/org/diylc/swing/images/help2.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/help2.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/help2.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/history.png b/diylc/diylc-swing/src/org/diylc/swing/images/history.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/history.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/history.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/html.png b/diylc/diylc-swing/src/org/diylc/swing/images/html.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/html.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/html.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_large.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_large.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/icon_large.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_large.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_medium.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_medium.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/icon_medium.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_medium.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/icon_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/icon_small.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/icon_small.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/icon_small.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/id_card.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/id_card_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/id_card_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/id_card_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/id_card_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/id_card_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/image.png b/diylc/diylc-swing/src/org/diylc/swing/images/image.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/image.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/image.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/jar_bean_into.png b/diylc/diylc-swing/src/org/diylc/swing/images/jar_bean_into.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/jar_bean_into.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/jar_bean_into.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/key_edit.png b/diylc/diylc-swing/src/org/diylc/swing/images/key_edit.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/key_edit.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/key_edit.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/laserpointer.png b/diylc/diylc-swing/src/org/diylc/swing/images/laserpointer.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/laserpointer.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/laserpointer.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/lightbulb_off.png b/diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_off.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/lightbulb_off.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_off.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/lightbulb_on.png b/diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_on.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/lightbulb_on.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/lightbulb_on.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline.png b/diylc/diylc-swing/src/org/diylc/swing/images/loadline.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/loadline.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/loadline.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/loadline_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/loadline_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/loadline_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/loadline_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/lock.png b/diylc/diylc-swing/src/org/diylc/swing/images/lock.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/lock.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/lock.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/lock_open.png b/diylc/diylc-swing/src/org/diylc/swing/images/lock_open.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/lock_open.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/lock_open.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/magic_wand.png b/diylc/diylc-swing/src/org/diylc/swing/images/magic_wand.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/magic_wand.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/magic_wand.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/manual.png b/diylc/diylc-swing/src/org/diylc/swing/images/manual.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/manual.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/manual.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/media_play_green.png b/diylc/diylc-swing/src/org/diylc/swing/images/media_play_green.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/media_play_green.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/media_play_green.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/media_stop_red.png b/diylc/diylc-swing/src/org/diylc/swing/images/media_stop_red.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/media_stop_red.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/media_stop_red.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/megaphone.png b/diylc/diylc-swing/src/org/diylc/swing/images/megaphone.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/megaphone.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/megaphone.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/messages.png b/diylc/diylc-swing/src/org/diylc/swing/images/messages.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/messages.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/messages.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/missing_image.png b/diylc/diylc-swing/src/org/diylc/swing/images/missing_image.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/missing_image.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/missing_image.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/move_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/move_small.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/move_small.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/move_small.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/nav_left_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/nav_left_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/nav_left_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/nav_left_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/nav_right_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/nav_right_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/nav_right_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/nav_right_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/navigate_check.png b/diylc/diylc-swing/src/org/diylc/swing/images/navigate_check.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/navigate_check.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/navigate_check.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/navigate_plus.png b/diylc/diylc-swing/src/org/diylc/swing/images/navigate_plus.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/navigate_plus.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/navigate_plus.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/node.png b/diylc/diylc-swing/src/org/diylc/swing/images/node.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/node.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/node.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/notebook_add.png b/diylc/diylc-swing/src/org/diylc/swing/images/notebook_add.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/notebook_add.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/notebook_add.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/pads.png b/diylc/diylc-swing/src/org/diylc/swing/images/pads.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/pads.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/pads.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/paste.png b/diylc/diylc-swing/src/org/diylc/swing/images/paste.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/paste.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/paste.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/pdf.png b/diylc/diylc-swing/src/org/diylc/swing/images/pdf.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/pdf.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/pdf.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/pens.png b/diylc/diylc-swing/src/org/diylc/swing/images/pens.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/pens.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/pens.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/photo_scenery.png b/diylc/diylc-swing/src/org/diylc/swing/images/photo_scenery.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/photo_scenery.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/photo_scenery.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/pin_green.png b/diylc/diylc-swing/src/org/diylc/swing/images/pin_green.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/pin_green.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/pin_green.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/pin_grey.png b/diylc/diylc-swing/src/org/diylc/swing/images/pin_grey.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/pin_grey.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/pin_grey.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/plugin.png b/diylc/diylc-swing/src/org/diylc/swing/images/plugin.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/plugin.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/plugin.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/print.png b/diylc/diylc-swing/src/org/diylc/swing/images/print.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/print.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/print.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/redo.png b/diylc/diylc-swing/src/org/diylc/swing/images/redo.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/redo.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/redo.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/refresh.png b/diylc/diylc-swing/src/org/diylc/swing/images/refresh.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/refresh.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/refresh.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/rotate_ccw.png b/diylc/diylc-swing/src/org/diylc/swing/images/rotate_ccw.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/rotate_ccw.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/rotate_ccw.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/rotate_cw.png b/diylc/diylc-swing/src/org/diylc/swing/images/rotate_cw.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/rotate_cw.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/rotate_cw.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/save_as.png b/diylc/diylc-swing/src/org/diylc/swing/images/save_as.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/save_as.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/save_as.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/scientist.png b/diylc/diylc-swing/src/org/diylc/swing/images/scientist.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/scientist.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/scientist.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/screwdriver.png b/diylc/diylc-swing/src/org/diylc/swing/images/screwdriver.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/screwdriver.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/screwdriver.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/scroll_information.png b/diylc/diylc-swing/src/org/diylc/swing/images/scroll_information.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/scroll_information.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/scroll_information.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/search-box.png b/diylc/diylc-swing/src/org/diylc/swing/images/search-box.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/search-box.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/search-box.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/selection.png b/diylc/diylc-swing/src/org/diylc/swing/images/selection.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/selection.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/selection.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/size.png b/diylc/diylc-swing/src/org/diylc/swing/images/size.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/size.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/size.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/sort.png b/diylc/diylc-swing/src/org/diylc/swing/images/sort.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/sort.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/sort.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/spinning.gif b/diylc/diylc-swing/src/org/diylc/swing/images/spinning.gif
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/spinning.gif
rename to diylc/diylc-swing/src/org/diylc/swing/images/spinning.gif
diff --git a/diylc/diylc-swing/src/org/diylc/images/splash.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/splash.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/splash.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_ceramic.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_ceramic.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/splash_ceramic.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_ceramic.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_electrolytic.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_electrolytic.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/splash_electrolytic.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_electrolytic.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_film.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_film.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/splash_film.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_film.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/splash_resistor.png b/diylc/diylc-swing/src/org/diylc/swing/images/splash_resistor.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/splash_resistor.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/splash_resistor.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/star_blue.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_blue.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/star_blue.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/star_blue.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/star_grey.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_grey.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/star_grey.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/star_grey.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/star_yellow.png b/diylc/diylc-swing/src/org/diylc/swing/images/star_yellow.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/star_yellow.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/star_yellow.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/tape_measure1.png b/diylc/diylc-swing/src/org/diylc/swing/images/tape_measure1.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/tape_measure1.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/tape_measure1.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/trace_mask.png b/diylc/diylc-swing/src/org/diylc/swing/images/trace_mask.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/trace_mask.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/trace_mask.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/undo.png b/diylc/diylc-swing/src/org/diylc/swing/images/undo.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/undo.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/undo.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/ungroup.png b/diylc/diylc-swing/src/org/diylc/swing/images/ungroup.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/ungroup.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/ungroup.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/upload.png b/diylc/diylc-swing/src/org/diylc/swing/images/upload.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/upload.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/upload.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/user1.png b/diylc/diylc-swing/src/org/diylc/swing/images/user1.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/user1.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/user1.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/view.png b/diylc/diylc-swing/src/org/diylc/swing/images/view.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/view.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/view.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/warning.png b/diylc/diylc-swing/src/org/diylc/swing/images/warning.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/warning.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/warning.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/web.png b/diylc/diylc-swing/src/org/diylc/swing/images/web.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/web.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/web.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/window_colors.png b/diylc/diylc-swing/src/org/diylc/swing/images/window_colors.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/window_colors.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/window_colors.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/wrench.png b/diylc/diylc-swing/src/org/diylc/swing/images/wrench.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/wrench.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/wrench.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_in.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_in.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/zoom_in.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_in.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_out.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_out.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/zoom_out.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_out.png
diff --git a/diylc/diylc-swing/src/org/diylc/images/zoom_small.png b/diylc/diylc-swing/src/org/diylc/swing/images/zoom_small.png
similarity index 100%
rename from diylc/diylc-swing/src/org/diylc/images/zoom_small.png
rename to diylc/diylc-swing/src/org/diylc/swing/images/zoom_small.png
diff --git a/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java b/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java
index ff204261..43499abb 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/loadline/LoadlineEditorFrame.java
@@ -54,11 +54,11 @@ import org.diylc.components.misc.LoadlineEntity;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
 import org.diylc.core.Project;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.core.measures.Voltage;
 import org.diylc.core.measures.VoltageUnit;
-import org.diylc.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.gui.DialogFactory;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index ac4d4130..7de953d8 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
@@ -61,9 +61,9 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Template;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
-import org.diylc.images.IconLoader;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.TranslatedMenu;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java
index 431fc0e7..d072dd34 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java
@@ -37,8 +37,8 @@ import org.diylc.common.EventType;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
-import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.core.IView;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.plugins.cloud.presenter.CloudException;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.presenter.Presenter;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
index d5266d2c..aea9e114 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
@@ -40,9 +40,9 @@ import java.awt.event.MouseListener;
 import java.awt.image.VolatileImage;
 
 import javax.swing.JPanel;
-import javax.swing.Timer;
-
-import org.diylc.images.IconLoader;
+import javax.swing.Timer;
+
+import org.diylc.swing.images.IconLoader;
 
 /**
  * JPanel that shows cloud animation while visible.
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
index cd06dc8f..f753b514 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
@@ -44,8 +44,8 @@ import javax.swing.event.ChangeListener;
 import org.apache.log4j.Logger;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
-import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.core.IView;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.plugins.cloud.presenter.SearchSession;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
index 9dfa48ec..39e7d86d 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
@@ -59,8 +59,8 @@ import org.diylc.appframework.miscutils.InMemoryConfigurationManager;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.core.IView;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.plugins.cloud.model.CommentEntity;
 import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
index 313da2b7..cf845cda 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
@@ -31,9 +31,9 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import org.diylc.images.IconLoader;
+import javax.swing.JTextField;
+
+import org.diylc.swing.images.IconLoader;
 
 public class SearchHeaderPanel extends JPanel {
 
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
index 060f109a..998b2be8 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
@@ -32,9 +32,9 @@ import java.awt.event.MouseListener;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-
-import org.diylc.images.IconLoader;
+import javax.swing.SwingConstants;
+
+import org.diylc.swing.images.IconLoader;
 
 /**
  * JPanel that shows cloud animation while visible.
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
index 399709ee..a895c8b2 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
@@ -32,8 +32,8 @@ import javax.swing.SwingWorker;
 import org.apache.log4j.Logger;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
-import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.core.IView;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.swing.ISimpleView;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
index b873f250..6e20c7e4 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/config/ConfigPlugin.java
@@ -33,8 +33,8 @@ import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.components.autocreate.SolderPadAutoCreator;
 import org.diylc.core.Theme;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.flags.FlagLoader;
-import org.diylc.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.lang.Language;
 import org.diylc.swing.ActionFactory;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
index 07106bfb..12fc6522 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java
@@ -37,7 +37,7 @@ import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.Project;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java
index b760f50e..06fc8606 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/BomDialog.java
@@ -34,9 +34,9 @@ import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
+import javax.swing.JScrollPane;
 
-import org.diylc.images.IconLoader;
+import org.diylc.core.images.IconLoader;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swingframework.export.TableExporter;
 import org.diylc.swingframework.objecttable.ObjectListTable;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
index 39ae2fa4..f6a3c857 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/FileMenuPlugin.java
@@ -31,8 +31,8 @@ import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.EventType;
 import org.diylc.common.INetlistAnalyzer;
 import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
+import org.diylc.common.IPlugInPort;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.IDynamicSubmenuHandler;
 import org.diylc.swing.ISwingUI;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java
index 22fbcc72..1423c61b 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/help/HelpMenuPlugin.java
@@ -38,7 +38,7 @@ import org.diylc.common.EventType;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
index a5f97c38..50b72d45 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
@@ -65,7 +65,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
index 6f9a1cc7..643c00df 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
@@ -46,7 +46,7 @@ import org.diylc.common.ComponentType;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Template;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.swingframework.openide.DropDownButtonFactory;
 
 /**
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
index 670964dc..b870eda4 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/tree/TreePanel.java
@@ -75,7 +75,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
 import org.diylc.core.Template;
-import org.diylc.images.IconLoader;
+import org.diylc.swing.images.IconLoader;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;