diff --git a/diylc/diylc-core/src/org/diylc/common/IComponentFiler.java b/diylc/diylc-core/src/org/diylc/common/IComponentFilter.java
similarity index 95%
rename from diylc/diylc-core/src/org/diylc/common/IComponentFiler.java
rename to diylc/diylc-core/src/org/diylc/common/IComponentFilter.java
index efe0defc..798a3c2f 100644
--- a/diylc/diylc-core/src/org/diylc/common/IComponentFiler.java
+++ b/diylc/diylc-core/src/org/diylc/common/IComponentFilter.java
@@ -23,7 +23,7 @@ package org.diylc.common;
 
 import org.diylc.core.IDIYComponent;
 
-public interface IComponentFiler {
+public interface IComponentFilter {
 
   boolean testComponent(IDIYComponent<?> component);
 }
diff --git a/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java b/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
index e4b5541a..403fc525 100644
--- a/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
+++ b/diylc/diylc-core/src/org/diylc/common/IPlugInPort.java
@@ -197,7 +197,7 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
    * @param externalZoom
    * @param visibleRect
    */
-  void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFiler filter, Double externalZoom, Rectangle2D visibleRect);
+  void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFilter filter, Double externalZoom, Rectangle2D visibleRect);
 
   Double[] getAvailableZoomLevels();
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
index 6649fa36..06e71abf 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/DrawingManager.java
@@ -45,7 +45,7 @@ import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.common.DrawOption;
 import org.diylc.common.EventType;
 import org.diylc.common.GridType;
-import org.diylc.common.IComponentFiler;
+import org.diylc.common.IComponentFilter;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.core.ComponentState;
@@ -141,7 +141,7 @@ public class DrawingManager {
    * @return
    */
   public List<IDIYComponent<?>> drawProject(Graphics2D g2d, Project project, Set<DrawOption> drawOptions,
-      IComponentFiler filter, Rectangle selectionRect, Collection<IDIYComponent<?>> selectedComponents,
+      IComponentFilter filter, Rectangle selectionRect, Collection<IDIYComponent<?>> selectedComponents,
       Set<IDIYComponent<?>> lockedComponents, Set<IDIYComponent<?>> groupedComponents, List<Point> controlPointSlot,
       List<IDIYComponent<?>> componentSlot, boolean dragInProgress, Double externalZoom, Rectangle2D visibleRect) {
     long totalStartTime = System.nanoTime();
diff --git a/diylc/diylc-core/src/org/diylc/presenter/PCBLayerFiler.java b/diylc/diylc-core/src/org/diylc/presenter/PCBLayerFilter.java
similarity index 88%
rename from diylc/diylc-core/src/org/diylc/presenter/PCBLayerFiler.java
rename to diylc/diylc-core/src/org/diylc/presenter/PCBLayerFilter.java
index 5cf96073..892f614c 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/PCBLayerFiler.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/PCBLayerFilter.java
@@ -23,15 +23,15 @@ package org.diylc.presenter;
 
 import java.lang.reflect.Method;
 
-import org.diylc.common.IComponentFiler;
+import org.diylc.common.IComponentFilter;
 import org.diylc.common.PCBLayer;
 import org.diylc.core.IDIYComponent;
 
-public class PCBLayerFiler implements IComponentFiler {
+public class PCBLayerFilter implements IComponentFilter {
 
   private PCBLayer layer;
 
-  public PCBLayerFiler(PCBLayer layer) {
+  public PCBLayerFilter(PCBLayer layer) {
     super();
     this.layer = layer;
   }
diff --git a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
index 1b4a918c..f0a13e59 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+++ b/diylc/diylc-core/src/org/diylc/presenter/Presenter.java
@@ -60,7 +60,7 @@ import org.diylc.common.BuildingBlockPackage;
 import org.diylc.common.ComponentType;
 import org.diylc.common.DrawOption;
 import org.diylc.common.EventType;
-import org.diylc.common.IComponentFiler;
+import org.diylc.common.IComponentFilter;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.IKeyProcessor;
 import org.diylc.common.INetlistAnalyzer;
@@ -87,6 +87,7 @@ import org.diylc.netlist.NetlistAnalyzer;
 import org.diylc.netlist.Node;
 import org.diylc.netlist.Position;
 import org.diylc.netlist.SwitchSetup;
+import org.diylc.serialization.ProjectFileManager;
 import org.diylc.test.DIYTest;
 import org.diylc.test.Snapshot;
 import org.diylc.utils.Constants;
@@ -465,7 +466,7 @@ public class Presenter implements IPlugInPort {
   }
 
   @Override
-  public void draw(Graphics2D g2d, Set<DrawOption> drawOptions, final IComponentFiler filter, Double externalZoom, Rectangle2D visibleRect) {
+  public void draw(Graphics2D g2d, Set<DrawOption> drawOptions, final IComponentFilter filter, Double externalZoom, Rectangle2D visibleRect) {
     if (currentProject == null) {
       return;
     }
@@ -478,7 +479,7 @@ public class Presenter implements IPlugInPort {
     }
 
     // Concatenate the specified filter with our own filter that removes hidden layers
-    IComponentFiler newFiler = new IComponentFiler() {
+    IComponentFilter newFiler = new IComponentFilter() {
 
       @Override
       public boolean testComponent(IDIYComponent<?> component) {
diff --git a/diylc/diylc-core/src/org/diylc/presenter/AreaConverter.java b/diylc/diylc-core/src/org/diylc/serialization/AreaConverter.java
similarity index 98%
rename from diylc/diylc-core/src/org/diylc/presenter/AreaConverter.java
rename to diylc/diylc-core/src/org/diylc/serialization/AreaConverter.java
index ce59cfa9..5de4014a 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/AreaConverter.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/AreaConverter.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import java.awt.Point;
 import java.awt.geom.Area;
diff --git a/diylc/diylc-core/src/org/diylc/presenter/ColorConverter.java b/diylc/diylc-core/src/org/diylc/serialization/ColorConverter.java
similarity index 97%
rename from diylc/diylc-core/src/org/diylc/presenter/ColorConverter.java
rename to diylc/diylc-core/src/org/diylc/serialization/ColorConverter.java
index ee581e28..20061899 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/ColorConverter.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/ColorConverter.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import java.awt.Color;
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/FontConverter.java b/diylc/diylc-core/src/org/diylc/serialization/FontConverter.java
similarity index 97%
rename from diylc/diylc-core/src/org/diylc/presenter/FontConverter.java
rename to diylc/diylc-core/src/org/diylc/serialization/FontConverter.java
index 4a8dc9ba..6c7d27b5 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/FontConverter.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/FontConverter.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import java.awt.Font;
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/MeasureConverter.java b/diylc/diylc-core/src/org/diylc/serialization/MeasureConverter.java
similarity index 98%
rename from diylc/diylc-core/src/org/diylc/presenter/MeasureConverter.java
rename to diylc/diylc-core/src/org/diylc/serialization/MeasureConverter.java
index 916babab..2955036f 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/MeasureConverter.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/MeasureConverter.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import org.diylc.core.measures.AbstractMeasure;
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/PointConverter.java b/diylc/diylc-core/src/org/diylc/serialization/PointConverter.java
similarity index 96%
rename from diylc/diylc-core/src/org/diylc/presenter/PointConverter.java
rename to diylc/diylc-core/src/org/diylc/serialization/PointConverter.java
index 905825ac..f7a186aa 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/PointConverter.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/PointConverter.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import java.awt.Point;
 
diff --git a/diylc/diylc-core/src/org/diylc/presenter/ProjectFileManager.java b/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java
similarity index 98%
rename from diylc/diylc-core/src/org/diylc/presenter/ProjectFileManager.java
rename to diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java
index f3d457ed..21dbf49e 100644
--- a/diylc/diylc-core/src/org/diylc/presenter/ProjectFileManager.java
+++ b/diylc/diylc-core/src/org/diylc/serialization/ProjectFileManager.java
@@ -19,7 +19,7 @@
     along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-package org.diylc.presenter;
+package org.diylc.serialization;
 
 import java.awt.Color;
 import java.io.File;
@@ -48,6 +48,7 @@ import org.diylc.appframework.update.VersionNumber;
 import org.diylc.common.EventType;
 import org.diylc.core.Project;
 import org.diylc.parsing.IOldFileParser;
+import org.diylc.presenter.Presenter;
 import org.diylc.test.DIYTest;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java
index 11ea8973..c3db900a 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/file/TraceMaskDrawingProvider.java
@@ -35,7 +35,7 @@ import org.diylc.common.DrawOption;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.PCBLayer;
 import org.diylc.core.IDIYComponent;
-import org.diylc.presenter.PCBLayerFiler;
+import org.diylc.presenter.PCBLayerFilter;
 import org.diylc.swingframework.IDrawingProvider;
 
 /**
@@ -60,7 +60,7 @@ public class TraceMaskDrawingProvider implements IDrawingProvider {
 
   @Override
   public void draw(int page, Graphics g, double zoomFactor) {
-    plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ANTIALIASING), new PCBLayerFiler(getUsedLayers()[page]), zoomFactor, null);
+    plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ANTIALIASING), new PCBLayerFilter(getUsedLayers()[page]), zoomFactor, null);
   }
 
   @Override
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/test/TestMenuPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/test/TestMenuPlugin.java
index 522a6591..ae9a1cba 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/test/TestMenuPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/test/TestMenuPlugin.java
@@ -39,7 +39,7 @@ import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ITask;
 import org.diylc.presenter.Presenter;
-import org.diylc.presenter.ProjectFileManager;
+import org.diylc.serialization.ProjectFileManager;
 import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.plugins.file.FileFilterEnum;