diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath
index aedd5a59..baa39e03 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath	
@@ -12,6 +12,6 @@
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
 	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar
new file mode 100644
index 00000000..da3fb559
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/app-framework.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath
index 045dd5c1..09ad88fe 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-library/.classpath	
@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar
new file mode 100644
index 00000000..da3fb559
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/app-framework.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/bancika-gui-framework.jar
deleted file mode 100644
index 1ccbbb07..00000000
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/bancika-gui-framework.jar and /dev/null differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar
new file mode 100644
index 00000000..19993a55
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc-core.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc.jar
deleted file mode 100644
index 0782abf3..00000000
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-library/lib/diylc.jar and /dev/null differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath
index 9c96a552..e231e1da 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/.classpath	
@@ -12,7 +12,8 @@
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
 	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
+	<classpathentry kind="lib" path="lib/swing-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar
new file mode 100644
index 00000000..da3fb559
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/app-framework.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/bancika-gui-framework.jar
deleted file mode 100644
index 439eb6b9..00000000
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/bancika-gui-framework.jar and /dev/null differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/bancika-gui-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar
similarity index 70%
rename from  diy-layout-creator --username bancika@gmail.com/diylc-core/lib/bancika-gui-framework.jar
rename to  diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar
index 439eb6b9..af28398a 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/lib/bancika-gui-framework.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar differ