diff --git a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCSplash.java b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCSplash.java
index 4a43a5ea..bdc26862 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCSplash.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCSplash.java
@@ -10,7 +10,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.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/main/java/org/diylc/swing/actions/CheckProximityAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/CheckProximityAction.java
index e5c03b2b..2b1bc28d 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/CheckProximityAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/CheckProximityAction.java
@@ -19,7 +19,7 @@ import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class CheckProximityAction extends AbstractAction implements Cloneable {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportGerberAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportGerberAction.java
index 9186239b..8c6ff82f 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportGerberAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportGerberAction.java
@@ -10,7 +10,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class ExportGerberAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportPNGAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportPNGAction.java
index b754a034..8f2443ea 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportPNGAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/ExportPNGAction.java
@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class ExportPNGAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
index 792a3448..c63d2364 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FindAction.java
@@ -9,7 +9,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.edit.FindDialog;
 
 public class FindAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FlexibleLeadsAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FlexibleLeadsAction.java
index eeebcef0..0742bc25 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FlexibleLeadsAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/FlexibleLeadsAction.java
@@ -7,7 +7,7 @@ import org.diylc.editor.FlexibleLeadsEditor;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class FlexibleLeadsAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/GenerateNetlistAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/GenerateNetlistAction.java
index 0a0a424a..4c8607be 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/GenerateNetlistAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/GenerateNetlistAction.java
@@ -14,7 +14,7 @@ import org.diylc.netlist.Group;
 import org.diylc.netlist.Netlist;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class GenerateNetlistAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/SummarizeNetlistAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/SummarizeNetlistAction.java
index a54f413a..9d509cb0 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/SummarizeNetlistAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/SummarizeNetlistAction.java
@@ -13,7 +13,7 @@ import org.diylc.common.ITask;
 import org.diylc.netlist.Netlist;
 import org.diylc.netlist.Summary;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SummarizeNetlistAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/BringToFrontAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/BringToFrontAction.java
index e80a7b19..dbbfb7d2 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/BringToFrontAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/BringToFrontAction.java
@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class BringToFrontAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CopyAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CopyAction.java
index c3f133bd..4ade138c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CopyAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CopyAction.java
@@ -11,7 +11,7 @@ import javax.swing.KeyStroke;
 import org.diylc.clipboard.ComponentTransferableFactory;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class CopyAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CutAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CutAction.java
index de656929..714c6eda 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CutAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/CutAction.java
@@ -11,7 +11,7 @@ import javax.swing.KeyStroke;
 import org.diylc.clipboard.ComponentTransferableFactory;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class CutAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DeleteSelectionAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DeleteSelectionAction.java
index ba37c561..70ef4924 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DeleteSelectionAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DeleteSelectionAction.java
@@ -8,7 +8,7 @@ import org.diylc.appframework.miscutils.Utils;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class DeleteSelectionAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DuplicateAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DuplicateAction.java
index 923e15aa..f2c59d2e 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DuplicateAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/DuplicateAction.java
@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class DuplicateAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditProjectAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditProjectAction.java
index 92c3d3dc..ef2e7ae9 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditProjectAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditProjectAction.java
@@ -12,7 +12,7 @@ import org.diylc.core.Project;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class EditProjectAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditSelectionAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditSelectionAction.java
index e6f97010..26a1dd26 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditSelectionAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/EditSelectionAction.java
@@ -10,7 +10,7 @@ import javax.swing.KeyStroke;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class EditSelectionAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/GroupAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/GroupAction.java
index 73ad6bd2..69c556cf 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/GroupAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/GroupAction.java
@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class GroupAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/MirrorSelectionAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/MirrorSelectionAction.java
index b4990bd2..6dfb6a09 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/MirrorSelectionAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/MirrorSelectionAction.java
@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class MirrorSelectionAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
index 78e54bab..d1a9d92a 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/NudgeAction.java
@@ -18,7 +18,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class NudgeAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/PasteAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/PasteAction.java
index c06cb488..15366fab 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/PasteAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/PasteAction.java
@@ -12,7 +12,7 @@ import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.common.IPlugInPort;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class PasteAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/RotateSelectionAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/RotateSelectionAction.java
index bb922c61..b5df64df 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/RotateSelectionAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/RotateSelectionAction.java
@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class RotateSelectionAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsBlockAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsBlockAction.java
index 9a794154..c51d7cab 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsBlockAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsBlockAction.java
@@ -6,7 +6,7 @@ import javax.swing.JOptionPane;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SaveAsBlockAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsTemplateAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsTemplateAction.java
index 1768cf2d..81754f8a 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsTemplateAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SaveAsTemplateAction.java
@@ -6,7 +6,7 @@ import javax.swing.JOptionPane;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SaveAsTemplateAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SelectAllAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SelectAllAction.java
index 8ec02bb5..c5397742 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SelectAllAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SelectAllAction.java
@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SelectAllAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SendToBackAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SendToBackAction.java
index 8057f4bd..97d2376c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SendToBackAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/SendToBackAction.java
@@ -7,7 +7,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SendToBackAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/UngroupAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/UngroupAction.java
index 0daee6c8..4d1f34b7 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/UngroupAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/edit/UngroupAction.java
@@ -8,7 +8,7 @@ import javax.swing.KeyStroke;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class UngroupAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/CreateBomAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/CreateBomAction.java
index 26ccf03b..513abe68 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/CreateBomAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/CreateBomAction.java
@@ -8,7 +8,7 @@ import javax.swing.AbstractAction;
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.BomDialog;
 import org.diylc.utils.BomEntry;
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExitAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExitAction.java
index b51c6eb2..b34ca1fe 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExitAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExitAction.java
@@ -5,7 +5,7 @@ import javax.swing.AbstractAction;
 
 import org.diylc.common.IPlugInPort;
 import org.diylc.swing.ActionFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class ExitAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExportPDFAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExportPDFAction.java
index f6d95336..cffecffd 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExportPDFAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ExportPDFAction.java
@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class ExportPDFAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
index 5efa0077..1133157e 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportAction.java
@@ -20,7 +20,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class ImportAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportNetlistAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportNetlistAction.java
index 5716a98b..f1f79018 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportNetlistAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/ImportNetlistAction.java
@@ -22,7 +22,7 @@ import org.diylc.netlist.ParsedNetlistEntry;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.NetlistImportDialog;
 
 public class ImportNetlistAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/NewAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/NewAction.java
index 5b56ee37..a254e1bf 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/NewAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/NewAction.java
@@ -15,7 +15,7 @@ import org.diylc.core.Project;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class NewAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/OpenAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/OpenAction.java
index 326e4cd0..650d7e2c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/OpenAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/OpenAction.java
@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class OpenAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/PrintAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/PrintAction.java
index d9c6e7bf..1246462f 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/PrintAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/PrintAction.java
@@ -13,7 +13,7 @@ import org.diylc.swingframework.export.DrawingExporter;
 import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class PrintAction extends AbstractAction {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAction.java
index 425d0d63..56a55153 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAction.java
@@ -12,7 +12,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class SaveAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAsAction.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAsAction.java
index da1c44db..4509101f 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAsAction.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/actions/file/SaveAsAction.java
@@ -13,7 +13,7 @@ import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
 public class SaveAsAction extends AbstractAction {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ComponentPopupMenu.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ComponentPopupMenu.java
index bc7ac3f0..ed99c915 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ComponentPopupMenu.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/ComponentPopupMenu.java
@@ -63,7 +63,7 @@ import org.diylc.swing.actions.edit.SaveAsBlockAction;
 import org.diylc.swing.actions.edit.SaveAsTemplateAction;
 import org.diylc.swing.actions.edit.SendToBackAction;
 import org.diylc.swing.actions.edit.UngroupAction;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;
 
 public class ComponentPopupMenu extends JPopupMenu implements ClipboardOwner {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/InfoDialog.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/InfoDialog.java
index 67b108f7..dc6ea087 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/InfoDialog.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/InfoDialog.java
@@ -28,7 +28,7 @@ import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.swingframework.ButtonDialog;
 
 import org.diylc.common.IPlugInPort;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class InfoDialog extends ButtonDialog {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/SearchTextField.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/SearchTextField.java
index e686f37a..0929c9ba 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/SearchTextField.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/SearchTextField.java
@@ -33,7 +33,7 @@ import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SearchTextField extends JTextField {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/actionbar/ActionBarPlugin.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
index 66b2af12..a30253b2 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/gui/actionbar/ActionBarPlugin.java
@@ -46,7 +46,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.help.HelpMenuPlugin;
 
 /**
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/loadline/LoadlineEditorFrame.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/loadline/LoadlineEditorFrame.java
index 54818d73..d3c956fc 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/loadline/LoadlineEditorFrame.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/loadline/LoadlineEditorFrame.java
@@ -65,7 +65,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.TranslatedPanel;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.canvas.CanvasPanel;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/CloudPlugIn.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/CloudPlugIn.java
index cdbd70e4..e26fe97c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/CloudPlugIn.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/CloudPlugIn.java
@@ -44,7 +44,7 @@ import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.DummyView;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.cloud.view.ChangePasswordDialog;
 import org.diylc.swing.plugins.cloud.view.LoginDialog;
 import org.diylc.swing.plugins.cloud.view.UploadDialog;
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
index 0e77e9cc..51185305 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/AnimatedCloudGlassPane.java
@@ -41,7 +41,7 @@ import java.awt.image.VolatileImage;
 import javax.swing.JPanel;
 import javax.swing.Timer;
 
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 /**
  * JPanel that shows cloud animation while visible.
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
index a85d1316..503b0c22 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
@@ -49,7 +49,7 @@ import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.plugins.cloud.presenter.SearchSession;
 import org.diylc.swing.ISimpleView;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.utils.Pair;
 
 /**
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
index 2dbbcf3e..bceee21a 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/ResultsScrollPanel.java
@@ -68,7 +68,7 @@ import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.DummyView;
 import org.diylc.swing.gui.components.HTMLTextArea;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.cloud.ThumbnailGenerator;
 import org.diylc.swing.plugins.cloud.view.CommentDialog;
 import org.diylc.swing.plugins.file.FileFilterEnum;
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
index 0b7cc871..8d5b146d 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
@@ -32,7 +32,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class SearchHeaderPanel extends JPanel {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
index 41b7a96f..015174b8 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/SimpleCloudGlassPane.java
@@ -33,7 +33,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 /**
  * JPanel that shows cloud animation while visible.
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
index 98c56701..9c55277c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/cloud/view/browser/UploadManagerFrame.java
@@ -36,7 +36,7 @@ import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.swing.ISimpleView;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class UploadManagerFrame extends JFrame implements ISimpleView {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/config/ConfigPlugin.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/config/ConfigPlugin.java
index 9186a6d5..3c75fc71 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/config/ConfigPlugin.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/config/ConfigPlugin.java
@@ -41,7 +41,7 @@ import org.diylc.lang.LangUtil;
 import org.diylc.lang.Language;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.utils.ResourceLoader;
 
 /**
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/edit/EditMenuPlugin.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/edit/EditMenuPlugin.java
index e0425434..c5efdd2c 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/edit/EditMenuPlugin.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/edit/EditMenuPlugin.java
@@ -59,7 +59,7 @@ import org.diylc.swing.actions.edit.SaveAsBlockAction;
 import org.diylc.swing.actions.edit.SaveAsTemplateAction;
 import org.diylc.swing.actions.edit.SendToBackAction;
 import org.diylc.swing.actions.edit.UngroupAction;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java
index e03d2cd6..afc13691 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/file/FileMenuPlugin.java
@@ -33,7 +33,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.swing.ActionFactory;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.loadline.LoadlineEditorFrame;
 
 /**
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/help/HelpMenuPlugin.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/help/HelpMenuPlugin.java
index 8a52ba77..e8ec7f4f 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/help/HelpMenuPlugin.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/help/HelpMenuPlugin.java
@@ -43,7 +43,7 @@ import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 /**
  * Entry point class for help-related utilities.
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java
index 2d7de7d5..57972de4 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/statusbar/StatusBar.java
@@ -72,7 +72,7 @@ import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
 import org.diylc.presenter.Presenter;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 public class StatusBar extends JPanel implements IPlugIn {
 
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
index 8c4297c7..e607fb3b 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentButtonFactory.java
@@ -58,7 +58,7 @@ import org.diylc.common.IPlugInPort;
 import org.diylc.common.IBlockProcessor.InvalidBlockException;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Template;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 
 /**
  * Factory that creates {@link JButton}s which display component type icons and instantiates the
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
index 90a0b423..8a1b4132 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java
@@ -56,7 +56,7 @@ import org.diylc.lang.LangUtil;
 import org.diylc.presenter.ComparatorFactory;
 import org.diylc.presenter.ComponentProcessor;
 import org.diylc.swing.ISwingUI;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.tree.TreePanel;
 import org.diylc.swing.plugins.tree.TreePanel.DeleteBlockAction;
 import org.diylc.swing.plugins.tree.TreePanel.SelectAllAction;
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java
index 2cc87fe7..8833ee67 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/tree/TreePanel.java
@@ -70,7 +70,7 @@ import org.diylc.core.Template;
 import org.diylc.lang.LangUtil;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.SearchTextField;
-import org.diylc.swing.images.IconLoader;
+import org.diylc.utils.IconLoader;
 import org.diylc.swing.plugins.toolbox.ComponentButtonFactory;
 
 public class TreePanel extends JPanel {
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/FlagLoader.java b/diylc/diylc-swing/src/main/java/org/diylc/utils/FlagLoader.java
similarity index 82%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/FlagLoader.java
rename to diylc/diylc-swing/src/main/java/org/diylc/utils/FlagLoader.java
index 61780931..4e09c095 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/flags/FlagLoader.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/utils/FlagLoader.java
@@ -19,25 +19,27 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.flags;
-
+package org.diylc.utils;
+
+import org.apache.log4j.Logger;
+
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-/**
- * Loads image resources as Icons.
- * 
- * @author Branislav Stojkovic
- */
-public class FlagLoader {
-
-  public static Icon getIcon(String name) {
-    java.net.URL imgURL = FlagLoader.class.getResource("flag_" + name + ".png");
-    if (imgURL != null) {
-      return new ImageIcon(imgURL, name);
-    } else {
-      System.err.println("Couldn't find file: " + name);
-      return null;
-    }
-  }
-}
+import javax.swing.ImageIcon;
+
+/**
+ * Loads image resources as Icons.
+ * 
+ * @author Branislav Stojkovic
+ */
+public class FlagLoader {
+
+  public static Icon getIcon(String name) {
+    java.net.URL imgURL = FlagLoader.class.getResource("/flags/flag_" + name + ".png");
+    if (imgURL != null) {
+      return new ImageIcon(imgURL, name);
+    } else {
+      Logger.getLogger(FlagLoader.class).error("Couldn't find file: " + name);
+      return null;
+    }
+  }
+}
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java b/diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java
similarity index 97%
rename from diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java
rename to diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java
index a27c9e32..54574782 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/swing/images/IconLoader.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java
@@ -19,10 +19,9 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.swing.images;
+package org.diylc.utils;
 
 import org.apache.log4j.Logger;
-import org.diylc.components.misc.SVGImage;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_afghanistan.png b/diylc/diylc-swing/src/main/resources/flags/flag_afghanistan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_afghanistan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_afghanistan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_albania.png b/diylc/diylc-swing/src/main/resources/flags/flag_albania.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_albania.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_albania.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_algeria.png b/diylc/diylc-swing/src/main/resources/flags/flag_algeria.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_algeria.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_algeria.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_american_samoa.png b/diylc/diylc-swing/src/main/resources/flags/flag_american_samoa.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_american_samoa.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_american_samoa.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_andorra.png b/diylc/diylc-swing/src/main/resources/flags/flag_andorra.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_andorra.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_andorra.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_angola.png b/diylc/diylc-swing/src/main/resources/flags/flag_angola.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_angola.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_angola.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_anguilla.png b/diylc/diylc-swing/src/main/resources/flags/flag_anguilla.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_anguilla.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_anguilla.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_antigua_and_barbuda.png b/diylc/diylc-swing/src/main/resources/flags/flag_antigua_and_barbuda.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_antigua_and_barbuda.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_antigua_and_barbuda.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_argentina.png b/diylc/diylc-swing/src/main/resources/flags/flag_argentina.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_argentina.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_argentina.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_armenia.png b/diylc/diylc-swing/src/main/resources/flags/flag_armenia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_armenia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_armenia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_aruba.png b/diylc/diylc-swing/src/main/resources/flags/flag_aruba.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_aruba.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_aruba.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_australia.png b/diylc/diylc-swing/src/main/resources/flags/flag_australia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_australia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_australia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_austria.png b/diylc/diylc-swing/src/main/resources/flags/flag_austria.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_austria.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_austria.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_azerbaijan.png b/diylc/diylc-swing/src/main/resources/flags/flag_azerbaijan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_azerbaijan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_azerbaijan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bahamas.png b/diylc/diylc-swing/src/main/resources/flags/flag_bahamas.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bahamas.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bahamas.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bahrain.png b/diylc/diylc-swing/src/main/resources/flags/flag_bahrain.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bahrain.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bahrain.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bangladesh.png b/diylc/diylc-swing/src/main/resources/flags/flag_bangladesh.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bangladesh.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bangladesh.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_barbados.png b/diylc/diylc-swing/src/main/resources/flags/flag_barbados.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_barbados.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_barbados.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belarus.png b/diylc/diylc-swing/src/main/resources/flags/flag_belarus.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belarus.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_belarus.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belgium.png b/diylc/diylc-swing/src/main/resources/flags/flag_belgium.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belgium.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_belgium.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belize.png b/diylc/diylc-swing/src/main/resources/flags/flag_belize.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_belize.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_belize.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_benin.png b/diylc/diylc-swing/src/main/resources/flags/flag_benin.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_benin.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_benin.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bermuda.png b/diylc/diylc-swing/src/main/resources/flags/flag_bermuda.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bermuda.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bermuda.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bhutan.png b/diylc/diylc-swing/src/main/resources/flags/flag_bhutan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bhutan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bhutan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bolivia.png b/diylc/diylc-swing/src/main/resources/flags/flag_bolivia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bolivia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bolivia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bosnia_and_herzegovina.png b/diylc/diylc-swing/src/main/resources/flags/flag_bosnia_and_herzegovina.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bosnia_and_herzegovina.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bosnia_and_herzegovina.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_botswana.png b/diylc/diylc-swing/src/main/resources/flags/flag_botswana.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_botswana.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_botswana.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_brazil.png b/diylc/diylc-swing/src/main/resources/flags/flag_brazil.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_brazil.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_brazil.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_british_indian_ocean_territory.png b/diylc/diylc-swing/src/main/resources/flags/flag_british_indian_ocean_territory.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_british_indian_ocean_territory.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_british_indian_ocean_territory.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_british_virgin_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_british_virgin_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_british_virgin_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_british_virgin_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_brunei.png b/diylc/diylc-swing/src/main/resources/flags/flag_brunei.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_brunei.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_brunei.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bulgaria.png b/diylc/diylc-swing/src/main/resources/flags/flag_bulgaria.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_bulgaria.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_bulgaria.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burkina_faso.png b/diylc/diylc-swing/src/main/resources/flags/flag_burkina_faso.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burkina_faso.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_burkina_faso.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burma.png b/diylc/diylc-swing/src/main/resources/flags/flag_burma.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burma.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_burma.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burundi.png b/diylc/diylc-swing/src/main/resources/flags/flag_burundi.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_burundi.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_burundi.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cambodia.png b/diylc/diylc-swing/src/main/resources/flags/flag_cambodia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cambodia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cambodia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cameroon.png b/diylc/diylc-swing/src/main/resources/flags/flag_cameroon.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cameroon.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cameroon.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_canada.png b/diylc/diylc-swing/src/main/resources/flags/flag_canada.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_canada.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_canada.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cape_verde.png b/diylc/diylc-swing/src/main/resources/flags/flag_cape_verde.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cape_verde.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cape_verde.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cayman_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_cayman_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cayman_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cayman_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_central_african_republic.png b/diylc/diylc-swing/src/main/resources/flags/flag_central_african_republic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_central_african_republic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_central_african_republic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_chad.png b/diylc/diylc-swing/src/main/resources/flags/flag_chad.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_chad.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_chad.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_chile.png b/diylc/diylc-swing/src/main/resources/flags/flag_chile.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_chile.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_chile.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_china.png b/diylc/diylc-swing/src/main/resources/flags/flag_china.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_china.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_china.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_colombia.png b/diylc/diylc-swing/src/main/resources/flags/flag_colombia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_colombia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_colombia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_comoros.png b/diylc/diylc-swing/src/main/resources/flags/flag_comoros.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_comoros.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_comoros.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_congo_democratic_republic.png b/diylc/diylc-swing/src/main/resources/flags/flag_congo_democratic_republic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_congo_democratic_republic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_congo_democratic_republic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_congo_republic.png b/diylc/diylc-swing/src/main/resources/flags/flag_congo_republic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_congo_republic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_congo_republic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cook_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_cook_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cook_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cook_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_costa_rica.png b/diylc/diylc-swing/src/main/resources/flags/flag_costa_rica.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_costa_rica.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_costa_rica.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cote_divoire.png b/diylc/diylc-swing/src/main/resources/flags/flag_cote_divoire.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cote_divoire.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cote_divoire.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_croatia.png b/diylc/diylc-swing/src/main/resources/flags/flag_croatia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_croatia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_croatia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cuba.png b/diylc/diylc-swing/src/main/resources/flags/flag_cuba.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cuba.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cuba.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cyprus.png b/diylc/diylc-swing/src/main/resources/flags/flag_cyprus.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_cyprus.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_cyprus.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_czech_republic.png b/diylc/diylc-swing/src/main/resources/flags/flag_czech_republic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_czech_republic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_czech_republic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_denmark.png b/diylc/diylc-swing/src/main/resources/flags/flag_denmark.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_denmark.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_denmark.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_djibouti.png b/diylc/diylc-swing/src/main/resources/flags/flag_djibouti.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_djibouti.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_djibouti.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_dominica.png b/diylc/diylc-swing/src/main/resources/flags/flag_dominica.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_dominica.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_dominica.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_dominican_republic.png b/diylc/diylc-swing/src/main/resources/flags/flag_dominican_republic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_dominican_republic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_dominican_republic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_east_timor.png b/diylc/diylc-swing/src/main/resources/flags/flag_east_timor.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_east_timor.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_east_timor.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_egypt.png b/diylc/diylc-swing/src/main/resources/flags/flag_egypt.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_egypt.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_egypt.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_el_salvador.png b/diylc/diylc-swing/src/main/resources/flags/flag_el_salvador.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_el_salvador.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_el_salvador.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_england.png b/diylc/diylc-swing/src/main/resources/flags/flag_england.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_england.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_england.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_equador.png b/diylc/diylc-swing/src/main/resources/flags/flag_equador.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_equador.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_equador.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_equatorial_guinea.png b/diylc/diylc-swing/src/main/resources/flags/flag_equatorial_guinea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_equatorial_guinea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_equatorial_guinea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_eritrea.png b/diylc/diylc-swing/src/main/resources/flags/flag_eritrea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_eritrea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_eritrea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_estonia.png b/diylc/diylc-swing/src/main/resources/flags/flag_estonia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_estonia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_estonia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ethiopia.png b/diylc/diylc-swing/src/main/resources/flags/flag_ethiopia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ethiopia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_ethiopia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_eu.png b/diylc/diylc-swing/src/main/resources/flags/flag_eu.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_eu.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_eu.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_falkland_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_falkland_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_falkland_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_falkland_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_faroe_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_faroe_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_faroe_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_faroe_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_fiji.png b/diylc/diylc-swing/src/main/resources/flags/flag_fiji.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_fiji.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_fiji.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_finland.png b/diylc/diylc-swing/src/main/resources/flags/flag_finland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_finland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_finland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_france.png b/diylc/diylc-swing/src/main/resources/flags/flag_france.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_france.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_france.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_french_polynesia.png b/diylc/diylc-swing/src/main/resources/flags/flag_french_polynesia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_french_polynesia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_french_polynesia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gabon.png b/diylc/diylc-swing/src/main/resources/flags/flag_gabon.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gabon.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_gabon.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gambia.png b/diylc/diylc-swing/src/main/resources/flags/flag_gambia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gambia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_gambia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_generic.png b/diylc/diylc-swing/src/main/resources/flags/flag_generic.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_generic.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_generic.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_georgia.png b/diylc/diylc-swing/src/main/resources/flags/flag_georgia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_georgia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_georgia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_germany.png b/diylc/diylc-swing/src/main/resources/flags/flag_germany.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_germany.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_germany.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ghana.png b/diylc/diylc-swing/src/main/resources/flags/flag_ghana.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ghana.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_ghana.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gibraltar.png b/diylc/diylc-swing/src/main/resources/flags/flag_gibraltar.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_gibraltar.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_gibraltar.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_great_britain.png b/diylc/diylc-swing/src/main/resources/flags/flag_great_britain.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_great_britain.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_great_britain.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_greece.png b/diylc/diylc-swing/src/main/resources/flags/flag_greece.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_greece.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_greece.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_greenland.png b/diylc/diylc-swing/src/main/resources/flags/flag_greenland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_greenland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_greenland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_grenada.png b/diylc/diylc-swing/src/main/resources/flags/flag_grenada.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_grenada.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_grenada.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guam.png b/diylc/diylc-swing/src/main/resources/flags/flag_guam.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guam.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guam.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guatemala.png b/diylc/diylc-swing/src/main/resources/flags/flag_guatemala.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guatemala.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guatemala.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guernsey.png b/diylc/diylc-swing/src/main/resources/flags/flag_guernsey.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guernsey.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guernsey.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guinea.png b/diylc/diylc-swing/src/main/resources/flags/flag_guinea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guinea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guinea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guinea_bissau.png b/diylc/diylc-swing/src/main/resources/flags/flag_guinea_bissau.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guinea_bissau.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guinea_bissau.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guyana.png b/diylc/diylc-swing/src/main/resources/flags/flag_guyana.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_guyana.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_guyana.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_haiti.png b/diylc/diylc-swing/src/main/resources/flags/flag_haiti.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_haiti.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_haiti.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_honduras.png b/diylc/diylc-swing/src/main/resources/flags/flag_honduras.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_honduras.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_honduras.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_hong_kong.png b/diylc/diylc-swing/src/main/resources/flags/flag_hong_kong.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_hong_kong.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_hong_kong.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_hungary.png b/diylc/diylc-swing/src/main/resources/flags/flag_hungary.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_hungary.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_hungary.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iceland.png b/diylc/diylc-swing/src/main/resources/flags/flag_iceland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iceland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_iceland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_india.png b/diylc/diylc-swing/src/main/resources/flags/flag_india.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_india.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_india.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_indonesia.png b/diylc/diylc-swing/src/main/resources/flags/flag_indonesia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_indonesia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_indonesia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iran.png b/diylc/diylc-swing/src/main/resources/flags/flag_iran.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iran.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_iran.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iraq.png b/diylc/diylc-swing/src/main/resources/flags/flag_iraq.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_iraq.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_iraq.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ireland.png b/diylc/diylc-swing/src/main/resources/flags/flag_ireland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ireland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_ireland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_isle_of_man.png b/diylc/diylc-swing/src/main/resources/flags/flag_isle_of_man.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_isle_of_man.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_isle_of_man.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_israel.png b/diylc/diylc-swing/src/main/resources/flags/flag_israel.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_israel.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_israel.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_italy.png b/diylc/diylc-swing/src/main/resources/flags/flag_italy.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_italy.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_italy.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jamaica.png b/diylc/diylc-swing/src/main/resources/flags/flag_jamaica.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jamaica.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_jamaica.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_japan.png b/diylc/diylc-swing/src/main/resources/flags/flag_japan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_japan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_japan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jersey.png b/diylc/diylc-swing/src/main/resources/flags/flag_jersey.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jersey.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_jersey.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jordan.png b/diylc/diylc-swing/src/main/resources/flags/flag_jordan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_jordan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_jordan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kazakhstan.png b/diylc/diylc-swing/src/main/resources/flags/flag_kazakhstan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kazakhstan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_kazakhstan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kenya.png b/diylc/diylc-swing/src/main/resources/flags/flag_kenya.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kenya.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_kenya.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kiribati.png b/diylc/diylc-swing/src/main/resources/flags/flag_kiribati.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kiribati.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_kiribati.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kuwait.png b/diylc/diylc-swing/src/main/resources/flags/flag_kuwait.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kuwait.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_kuwait.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kyrgyzstan.png b/diylc/diylc-swing/src/main/resources/flags/flag_kyrgyzstan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_kyrgyzstan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_kyrgyzstan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_laos.png b/diylc/diylc-swing/src/main/resources/flags/flag_laos.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_laos.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_laos.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_latvia.png b/diylc/diylc-swing/src/main/resources/flags/flag_latvia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_latvia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_latvia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lebanon.png b/diylc/diylc-swing/src/main/resources/flags/flag_lebanon.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lebanon.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_lebanon.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lesotho.png b/diylc/diylc-swing/src/main/resources/flags/flag_lesotho.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lesotho.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_lesotho.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_liberia.png b/diylc/diylc-swing/src/main/resources/flags/flag_liberia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_liberia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_liberia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_libya.png b/diylc/diylc-swing/src/main/resources/flags/flag_libya.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_libya.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_libya.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_liechtenstein.png b/diylc/diylc-swing/src/main/resources/flags/flag_liechtenstein.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_liechtenstein.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_liechtenstein.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lithuania.png b/diylc/diylc-swing/src/main/resources/flags/flag_lithuania.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_lithuania.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_lithuania.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_luxembourg.png b/diylc/diylc-swing/src/main/resources/flags/flag_luxembourg.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_luxembourg.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_luxembourg.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_macau.png b/diylc/diylc-swing/src/main/resources/flags/flag_macau.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_macau.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_macau.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_macedonia.png b/diylc/diylc-swing/src/main/resources/flags/flag_macedonia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_macedonia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_macedonia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_madagascar.png b/diylc/diylc-swing/src/main/resources/flags/flag_madagascar.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_madagascar.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_madagascar.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malawi.png b/diylc/diylc-swing/src/main/resources/flags/flag_malawi.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malawi.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_malawi.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malaysia.png b/diylc/diylc-swing/src/main/resources/flags/flag_malaysia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malaysia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_malaysia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_maledives.png b/diylc/diylc-swing/src/main/resources/flags/flag_maledives.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_maledives.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_maledives.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mali.png b/diylc/diylc-swing/src/main/resources/flags/flag_mali.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mali.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mali.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malta.png b/diylc/diylc-swing/src/main/resources/flags/flag_malta.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_malta.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_malta.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_marshall_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_marshall_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_marshall_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_marshall_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_martinique.png b/diylc/diylc-swing/src/main/resources/flags/flag_martinique.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_martinique.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_martinique.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mauretania.png b/diylc/diylc-swing/src/main/resources/flags/flag_mauretania.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mauretania.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mauretania.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mauritius.png b/diylc/diylc-swing/src/main/resources/flags/flag_mauritius.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mauritius.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mauritius.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mexico.png b/diylc/diylc-swing/src/main/resources/flags/flag_mexico.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mexico.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mexico.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_micronesia.png b/diylc/diylc-swing/src/main/resources/flags/flag_micronesia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_micronesia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_micronesia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_moldova.png b/diylc/diylc-swing/src/main/resources/flags/flag_moldova.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_moldova.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_moldova.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_monaco.png b/diylc/diylc-swing/src/main/resources/flags/flag_monaco.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_monaco.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_monaco.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mongolia.png b/diylc/diylc-swing/src/main/resources/flags/flag_mongolia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mongolia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mongolia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_montserrat.png b/diylc/diylc-swing/src/main/resources/flags/flag_montserrat.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_montserrat.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_montserrat.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_morocco.png b/diylc/diylc-swing/src/main/resources/flags/flag_morocco.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_morocco.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_morocco.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mozambique.png b/diylc/diylc-swing/src/main/resources/flags/flag_mozambique.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_mozambique.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_mozambique.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_namibia.png b/diylc/diylc-swing/src/main/resources/flags/flag_namibia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_namibia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_namibia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nauru.png b/diylc/diylc-swing/src/main/resources/flags/flag_nauru.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nauru.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_nauru.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nepal.png b/diylc/diylc-swing/src/main/resources/flags/flag_nepal.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nepal.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_nepal.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_netherlands.png b/diylc/diylc-swing/src/main/resources/flags/flag_netherlands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_netherlands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_netherlands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_netherlands_antilles.png b/diylc/diylc-swing/src/main/resources/flags/flag_netherlands_antilles.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_netherlands_antilles.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_netherlands_antilles.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_new_zealand.png b/diylc/diylc-swing/src/main/resources/flags/flag_new_zealand.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_new_zealand.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_new_zealand.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nicaragua.png b/diylc/diylc-swing/src/main/resources/flags/flag_nicaragua.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nicaragua.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_nicaragua.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_niger.png b/diylc/diylc-swing/src/main/resources/flags/flag_niger.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_niger.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_niger.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nigeria.png b/diylc/diylc-swing/src/main/resources/flags/flag_nigeria.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_nigeria.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_nigeria.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_niue.png b/diylc/diylc-swing/src/main/resources/flags/flag_niue.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_niue.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_niue.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_norfolk_island.png b/diylc/diylc-swing/src/main/resources/flags/flag_norfolk_island.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_norfolk_island.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_norfolk_island.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_north_korea.png b/diylc/diylc-swing/src/main/resources/flags/flag_north_korea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_north_korea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_north_korea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_northern_mariana_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_northern_mariana_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_northern_mariana_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_northern_mariana_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_norway.png b/diylc/diylc-swing/src/main/resources/flags/flag_norway.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_norway.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_norway.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_oman.png b/diylc/diylc-swing/src/main/resources/flags/flag_oman.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_oman.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_oman.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_pakistan.png b/diylc/diylc-swing/src/main/resources/flags/flag_pakistan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_pakistan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_pakistan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_palau.png b/diylc/diylc-swing/src/main/resources/flags/flag_palau.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_palau.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_palau.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_panama.png b/diylc/diylc-swing/src/main/resources/flags/flag_panama.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_panama.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_panama.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_papua_new_guinea.png b/diylc/diylc-swing/src/main/resources/flags/flag_papua_new_guinea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_papua_new_guinea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_papua_new_guinea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_paraquay.png b/diylc/diylc-swing/src/main/resources/flags/flag_paraquay.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_paraquay.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_paraquay.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_peru.png b/diylc/diylc-swing/src/main/resources/flags/flag_peru.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_peru.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_peru.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_philippines.png b/diylc/diylc-swing/src/main/resources/flags/flag_philippines.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_philippines.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_philippines.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_pitcairn_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_pitcairn_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_pitcairn_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_pitcairn_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_poland.png b/diylc/diylc-swing/src/main/resources/flags/flag_poland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_poland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_poland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_portugal.png b/diylc/diylc-swing/src/main/resources/flags/flag_portugal.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_portugal.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_portugal.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_puerto_rico.png b/diylc/diylc-swing/src/main/resources/flags/flag_puerto_rico.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_puerto_rico.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_puerto_rico.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_qatar.png b/diylc/diylc-swing/src/main/resources/flags/flag_qatar.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_qatar.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_qatar.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_romania.png b/diylc/diylc-swing/src/main/resources/flags/flag_romania.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_romania.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_romania.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_russia.png b/diylc/diylc-swing/src/main/resources/flags/flag_russia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_russia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_russia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_rwanda.png b/diylc/diylc-swing/src/main/resources/flags/flag_rwanda.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_rwanda.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_rwanda.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_helena.png b/diylc/diylc-swing/src/main/resources/flags/flag_saint_helena.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_helena.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saint_helena.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_kitts_and_nevis.png b/diylc/diylc-swing/src/main/resources/flags/flag_saint_kitts_and_nevis.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_kitts_and_nevis.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saint_kitts_and_nevis.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_lucia.png b/diylc/diylc-swing/src/main/resources/flags/flag_saint_lucia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_lucia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saint_lucia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_pierre_and_miquelon.png b/diylc/diylc-swing/src/main/resources/flags/flag_saint_pierre_and_miquelon.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_pierre_and_miquelon.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saint_pierre_and_miquelon.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_vincent_and_the_grenadines.png b/diylc/diylc-swing/src/main/resources/flags/flag_saint_vincent_and_the_grenadines.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saint_vincent_and_the_grenadines.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saint_vincent_and_the_grenadines.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_samoa.png b/diylc/diylc-swing/src/main/resources/flags/flag_samoa.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_samoa.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_samoa.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_san_marino.png b/diylc/diylc-swing/src/main/resources/flags/flag_san_marino.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_san_marino.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_san_marino.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sao_tome_and_principe.png b/diylc/diylc-swing/src/main/resources/flags/flag_sao_tome_and_principe.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sao_tome_and_principe.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_sao_tome_and_principe.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saudi_arabia.png b/diylc/diylc-swing/src/main/resources/flags/flag_saudi_arabia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_saudi_arabia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_saudi_arabia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_scotland.png b/diylc/diylc-swing/src/main/resources/flags/flag_scotland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_scotland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_scotland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_senegal.png b/diylc/diylc-swing/src/main/resources/flags/flag_senegal.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_senegal.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_senegal.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_serbia.png b/diylc/diylc-swing/src/main/resources/flags/flag_serbia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_serbia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_serbia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_seychelles.png b/diylc/diylc-swing/src/main/resources/flags/flag_seychelles.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_seychelles.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_seychelles.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sierra_leone.png b/diylc/diylc-swing/src/main/resources/flags/flag_sierra_leone.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sierra_leone.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_sierra_leone.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_singapore.png b/diylc/diylc-swing/src/main/resources/flags/flag_singapore.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_singapore.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_singapore.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_slovakia.png b/diylc/diylc-swing/src/main/resources/flags/flag_slovakia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_slovakia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_slovakia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_slovenia.png b/diylc/diylc-swing/src/main/resources/flags/flag_slovenia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_slovenia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_slovenia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_solomon_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_solomon_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_solomon_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_solomon_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_somalia.png b/diylc/diylc-swing/src/main/resources/flags/flag_somalia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_somalia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_somalia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_africa.png b/diylc/diylc-swing/src/main/resources/flags/flag_south_africa.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_africa.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_south_africa.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_georgia.png b/diylc/diylc-swing/src/main/resources/flags/flag_south_georgia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_georgia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_south_georgia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_korea.png b/diylc/diylc-swing/src/main/resources/flags/flag_south_korea.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_south_korea.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_south_korea.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_spain.png b/diylc/diylc-swing/src/main/resources/flags/flag_spain.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_spain.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_spain.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sri_lanka.png b/diylc/diylc-swing/src/main/resources/flags/flag_sri_lanka.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sri_lanka.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_sri_lanka.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sudan.png b/diylc/diylc-swing/src/main/resources/flags/flag_sudan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sudan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_sudan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_suriname.png b/diylc/diylc-swing/src/main/resources/flags/flag_suriname.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_suriname.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_suriname.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_swaziland.png b/diylc/diylc-swing/src/main/resources/flags/flag_swaziland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_swaziland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_swaziland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sweden.png b/diylc/diylc-swing/src/main/resources/flags/flag_sweden.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_sweden.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_sweden.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_switzerland.png b/diylc/diylc-swing/src/main/resources/flags/flag_switzerland.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_switzerland.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_switzerland.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_syria.png b/diylc/diylc-swing/src/main/resources/flags/flag_syria.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_syria.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_syria.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_taiwan.png b/diylc/diylc-swing/src/main/resources/flags/flag_taiwan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_taiwan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_taiwan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tajikistan.png b/diylc/diylc-swing/src/main/resources/flags/flag_tajikistan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tajikistan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tajikistan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tanzania.png b/diylc/diylc-swing/src/main/resources/flags/flag_tanzania.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tanzania.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tanzania.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_thailand.png b/diylc/diylc-swing/src/main/resources/flags/flag_thailand.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_thailand.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_thailand.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tibet.png b/diylc/diylc-swing/src/main/resources/flags/flag_tibet.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tibet.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tibet.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_togo.png b/diylc/diylc-swing/src/main/resources/flags/flag_togo.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_togo.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_togo.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tonga.png b/diylc/diylc-swing/src/main/resources/flags/flag_tonga.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tonga.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tonga.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_trinidad_and_tobago.png b/diylc/diylc-swing/src/main/resources/flags/flag_trinidad_and_tobago.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_trinidad_and_tobago.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_trinidad_and_tobago.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tunisia.png b/diylc/diylc-swing/src/main/resources/flags/flag_tunisia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tunisia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tunisia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turkey.png b/diylc/diylc-swing/src/main/resources/flags/flag_turkey.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turkey.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_turkey.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turkmenistan.png b/diylc/diylc-swing/src/main/resources/flags/flag_turkmenistan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turkmenistan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_turkmenistan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turks_and_caicos_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_turks_and_caicos_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_turks_and_caicos_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_turks_and_caicos_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tuvalu.png b/diylc/diylc-swing/src/main/resources/flags/flag_tuvalu.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_tuvalu.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_tuvalu.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uganda.png b/diylc/diylc-swing/src/main/resources/flags/flag_uganda.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uganda.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_uganda.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ukraine.png b/diylc/diylc-swing/src/main/resources/flags/flag_ukraine.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_ukraine.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_ukraine.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_united_arab_emirates.png b/diylc/diylc-swing/src/main/resources/flags/flag_united_arab_emirates.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_united_arab_emirates.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_united_arab_emirates.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uruquay.png b/diylc/diylc-swing/src/main/resources/flags/flag_uruquay.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uruquay.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_uruquay.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_usa.png b/diylc/diylc-swing/src/main/resources/flags/flag_usa.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_usa.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_usa.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uzbekistan.png b/diylc/diylc-swing/src/main/resources/flags/flag_uzbekistan.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_uzbekistan.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_uzbekistan.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vanuatu.png b/diylc/diylc-swing/src/main/resources/flags/flag_vanuatu.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vanuatu.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_vanuatu.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vatican_city.png b/diylc/diylc-swing/src/main/resources/flags/flag_vatican_city.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vatican_city.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_vatican_city.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_venezuela.png b/diylc/diylc-swing/src/main/resources/flags/flag_venezuela.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_venezuela.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_venezuela.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vietnam.png b/diylc/diylc-swing/src/main/resources/flags/flag_vietnam.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_vietnam.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_vietnam.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_virgin_islands.png b/diylc/diylc-swing/src/main/resources/flags/flag_virgin_islands.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_virgin_islands.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_virgin_islands.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_wales.png b/diylc/diylc-swing/src/main/resources/flags/flag_wales.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_wales.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_wales.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_wallis_and_futuna.png b/diylc/diylc-swing/src/main/resources/flags/flag_wallis_and_futuna.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_wallis_and_futuna.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_wallis_and_futuna.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_yemen.png b/diylc/diylc-swing/src/main/resources/flags/flag_yemen.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_yemen.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_yemen.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_zambia.png b/diylc/diylc-swing/src/main/resources/flags/flag_zambia.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_zambia.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_zambia.png
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/flags/flag_zimbabwe.png b/diylc/diylc-swing/src/main/resources/flags/flag_zimbabwe.png
similarity index 100%
rename from diylc/diylc-swing/src/main/java/org/diylc/flags/flag_zimbabwe.png
rename to diylc/diylc-swing/src/main/resources/flags/flag_zimbabwe.png