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..3c2714ce
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-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar
index 5c11e16e..f549fe36 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java
index fcfbed5e..fab8f7b9 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
@@ -57,7 +57,7 @@ public class Presenter implements IPlugInPort {
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
 	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3,
-			19, 0);
+			20, 0);
 	public static final String DEFAULTS_KEY_PREFIX = "default.";
 
 	public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/plugins/file/BomMakerTest.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/plugins/file/BomMakerTest.java
index 39c98e6a..18d20b8e 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/plugins/file/BomMakerTest.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/plugins/file/BomMakerTest.java	
@@ -6,10 +6,10 @@ import static org.junit.Assert.assertNotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.diylc.components.MockDIYComponent;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.measures.Capacitance;
 import org.diylc.core.measures.CapacitanceUnit;
+import org.diylc.testcomponents.MockDIYComponent;
 import org.diylc.utils.BomEntry;
 import org.diylc.utils.BomMaker;
 import org.junit.Test;
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java
index 80ab6068..33d41329 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/presenter/ClassProcessorTest.java	
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertNotNull;
 import java.util.List;
 
 import org.diylc.common.PropertyWrapper;
-import org.diylc.components.MockDIYComponent;
+import org.diylc.testcomponents.MockDIYComponent;
 import org.junit.Test;
 
 
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/testcomponents/MockDIYComponent.java
similarity index 93%
rename from  diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java
rename to  diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/testcomponents/MockDIYComponent.java
index a4736db3..c642a1a1 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/components/MockDIYComponent.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/test/org/diylc/testcomponents/MockDIYComponent.java	
@@ -1,9 +1,10 @@
-package org.diylc.components;
+package org.diylc.testcomponents;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Point;
 
+import org.diylc.components.AbstractComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;