diff --git a/picedit/.classpath b/.classpath
similarity index 100%
rename from picedit/.classpath
rename to .classpath
diff --git a/picedit/.project b/.project
similarity index 100%
rename from picedit/.project
rename to .project
diff --git a/picedit/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from picedit/.settings/org.eclipse.jdt.core.prefs
rename to .settings/org.eclipse.jdt.core.prefs
diff --git a/picedit/MANIFEST.MF b/MANIFEST.MF
similarity index 100%
rename from picedit/MANIFEST.MF
rename to MANIFEST.MF
diff --git a/picedit/build.xml b/build.xml
similarity index 100%
rename from picedit/build.xml
rename to build.xml
diff --git a/picedit/src/com/agifans/picedit/PicEdit.java b/src/com/agifans/picedit/PicEdit.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/PicEdit.java
rename to src/com/agifans/picedit/PicEdit.java
diff --git a/picedit/src/com/agifans/picedit/PicEditLauncher.java b/src/com/agifans/picedit/PicEditLauncher.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/PicEditLauncher.java
rename to src/com/agifans/picedit/PicEditLauncher.java
diff --git a/picedit/src/com/agifans/picedit/gui/PicEditDesktopManager.java b/src/com/agifans/picedit/gui/PicEditDesktopManager.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/PicEditDesktopManager.java
rename to src/com/agifans/picedit/gui/PicEditDesktopManager.java
diff --git a/picedit/src/com/agifans/picedit/gui/PictureCodeList.java b/src/com/agifans/picedit/gui/PictureCodeList.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/PictureCodeList.java
rename to src/com/agifans/picedit/gui/PictureCodeList.java
diff --git a/picedit/src/com/agifans/picedit/gui/PictureList.java b/src/com/agifans/picedit/gui/PictureList.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/PictureList.java
rename to src/com/agifans/picedit/gui/PictureList.java
diff --git a/picedit/src/com/agifans/picedit/gui/StatusBarPanel.java b/src/com/agifans/picedit/gui/StatusBarPanel.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/StatusBarPanel.java
rename to src/com/agifans/picedit/gui/StatusBarPanel.java
diff --git a/picedit/src/com/agifans/picedit/gui/frame/NavigationButtonType.java b/src/com/agifans/picedit/gui/frame/NavigationButtonType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/frame/NavigationButtonType.java
rename to src/com/agifans/picedit/gui/frame/NavigationButtonType.java
diff --git a/picedit/src/com/agifans/picedit/gui/frame/PictureFrame.java b/src/com/agifans/picedit/gui/frame/PictureFrame.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/frame/PictureFrame.java
rename to src/com/agifans/picedit/gui/frame/PictureFrame.java
diff --git a/picedit/src/com/agifans/picedit/gui/frame/PicturePanel.java b/src/com/agifans/picedit/gui/frame/PicturePanel.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/frame/PicturePanel.java
rename to src/com/agifans/picedit/gui/frame/PicturePanel.java
diff --git a/picedit/src/com/agifans/picedit/gui/frame/PositionSliderModel.java b/src/com/agifans/picedit/gui/frame/PositionSliderModel.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/frame/PositionSliderModel.java
rename to src/com/agifans/picedit/gui/frame/PositionSliderModel.java
diff --git a/picedit/src/com/agifans/picedit/gui/handler/KeyboardHandler.java b/src/com/agifans/picedit/gui/handler/KeyboardHandler.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/handler/KeyboardHandler.java
rename to src/com/agifans/picedit/gui/handler/KeyboardHandler.java
diff --git a/picedit/src/com/agifans/picedit/gui/handler/MouseHandler.java b/src/com/agifans/picedit/gui/handler/MouseHandler.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/handler/MouseHandler.java
rename to src/com/agifans/picedit/gui/handler/MouseHandler.java
diff --git a/picedit/src/com/agifans/picedit/gui/menu/Menu.java b/src/com/agifans/picedit/gui/menu/Menu.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/menu/Menu.java
rename to src/com/agifans/picedit/gui/menu/Menu.java
diff --git a/picedit/src/com/agifans/picedit/gui/menu/MenuOption.java b/src/com/agifans/picedit/gui/menu/MenuOption.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/menu/MenuOption.java
rename to src/com/agifans/picedit/gui/menu/MenuOption.java
diff --git a/picedit/src/com/agifans/picedit/gui/toolbar/BrushChooserDialog.java b/src/com/agifans/picedit/gui/toolbar/BrushChooserDialog.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/toolbar/BrushChooserDialog.java
rename to src/com/agifans/picedit/gui/toolbar/BrushChooserDialog.java
diff --git a/picedit/src/com/agifans/picedit/gui/toolbar/ColourChooserDialog.java b/src/com/agifans/picedit/gui/toolbar/ColourChooserDialog.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/toolbar/ColourChooserDialog.java
rename to src/com/agifans/picedit/gui/toolbar/ColourChooserDialog.java
diff --git a/picedit/src/com/agifans/picedit/gui/toolbar/ToolPanel.java b/src/com/agifans/picedit/gui/toolbar/ToolPanel.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/toolbar/ToolPanel.java
rename to src/com/agifans/picedit/gui/toolbar/ToolPanel.java
diff --git a/picedit/src/com/agifans/picedit/gui/toolbar/ToolPanelLocation.java b/src/com/agifans/picedit/gui/toolbar/ToolPanelLocation.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/gui/toolbar/ToolPanelLocation.java
rename to src/com/agifans/picedit/gui/toolbar/ToolPanelLocation.java
diff --git a/picedit/src/com/agifans/picedit/help/help.html b/src/com/agifans/picedit/help/help.html
similarity index 100%
rename from picedit/src/com/agifans/picedit/help/help.html
rename to src/com/agifans/picedit/help/help.html
diff --git a/picedit/src/com/agifans/picedit/images/Back24.gif b/src/com/agifans/picedit/images/Back24.gif
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/Back24.gif
rename to src/com/agifans/picedit/images/Back24.gif
diff --git a/picedit/src/com/agifans/picedit/images/Forward24.gif b/src/com/agifans/picedit/images/Forward24.gif
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/Forward24.gif
rename to src/com/agifans/picedit/images/Forward24.gif
diff --git a/picedit/src/com/agifans/picedit/images/airbrush.png b/src/com/agifans/picedit/images/airbrush.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/airbrush.png
rename to src/com/agifans/picedit/images/airbrush.png
diff --git a/picedit/src/com/agifans/picedit/images/brush.png b/src/com/agifans/picedit/images/brush.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/brush.png
rename to src/com/agifans/picedit/images/brush.png
diff --git a/picedit/src/com/agifans/picedit/images/ellipse.png b/src/com/agifans/picedit/images/ellipse.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/ellipse.png
rename to src/com/agifans/picedit/images/ellipse.png
diff --git a/picedit/src/com/agifans/picedit/images/eraser.png b/src/com/agifans/picedit/images/eraser.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/eraser.png
rename to src/com/agifans/picedit/images/eraser.png
diff --git a/picedit/src/com/agifans/picedit/images/eyedropper.png b/src/com/agifans/picedit/images/eyedropper.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/eyedropper.png
rename to src/com/agifans/picedit/images/eyedropper.png
diff --git a/picedit/src/com/agifans/picedit/images/fill.png b/src/com/agifans/picedit/images/fill.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/fill.png
rename to src/com/agifans/picedit/images/fill.png
diff --git a/picedit/src/com/agifans/picedit/images/hovered.png b/src/com/agifans/picedit/images/hovered.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/hovered.png
rename to src/com/agifans/picedit/images/hovered.png
diff --git a/picedit/src/com/agifans/picedit/images/hoveredcolour.png b/src/com/agifans/picedit/images/hoveredcolour.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/hoveredcolour.png
rename to src/com/agifans/picedit/images/hoveredcolour.png
diff --git a/picedit/src/com/agifans/picedit/images/line.png b/src/com/agifans/picedit/images/line.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/line.png
rename to src/com/agifans/picedit/images/line.png
diff --git a/picedit/src/com/agifans/picedit/images/pencil.png b/src/com/agifans/picedit/images/pencil.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/pencil.png
rename to src/com/agifans/picedit/images/pencil.png
diff --git a/picedit/src/com/agifans/picedit/images/pressed.png b/src/com/agifans/picedit/images/pressed.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/pressed.png
rename to src/com/agifans/picedit/images/pressed.png
diff --git a/picedit/src/com/agifans/picedit/images/pressedcolour.png b/src/com/agifans/picedit/images/pressedcolour.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/pressedcolour.png
rename to src/com/agifans/picedit/images/pressedcolour.png
diff --git a/picedit/src/com/agifans/picedit/images/rectangle.png b/src/com/agifans/picedit/images/rectangle.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/rectangle.png
rename to src/com/agifans/picedit/images/rectangle.png
diff --git a/picedit/src/com/agifans/picedit/images/selection.png b/src/com/agifans/picedit/images/selection.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/selection.png
rename to src/com/agifans/picedit/images/selection.png
diff --git a/picedit/src/com/agifans/picedit/images/shortline.png b/src/com/agifans/picedit/images/shortline.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/shortline.png
rename to src/com/agifans/picedit/images/shortline.png
diff --git a/picedit/src/com/agifans/picedit/images/stepline.png b/src/com/agifans/picedit/images/stepline.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/stepline.png
rename to src/com/agifans/picedit/images/stepline.png
diff --git a/picedit/src/com/agifans/picedit/images/zoom.png b/src/com/agifans/picedit/images/zoom.png
similarity index 100%
rename from picedit/src/com/agifans/picedit/images/zoom.png
rename to src/com/agifans/picedit/images/zoom.png
diff --git a/picedit/src/com/agifans/picedit/picture/EditStatus.java b/src/com/agifans/picedit/picture/EditStatus.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/EditStatus.java
rename to src/com/agifans/picedit/picture/EditStatus.java
diff --git a/picedit/src/com/agifans/picedit/picture/Picture.java b/src/com/agifans/picedit/picture/Picture.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/Picture.java
rename to src/com/agifans/picedit/picture/Picture.java
diff --git a/picedit/src/com/agifans/picedit/picture/PictureCache.java b/src/com/agifans/picedit/picture/PictureCache.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/PictureCache.java
rename to src/com/agifans/picedit/picture/PictureCache.java
diff --git a/picedit/src/com/agifans/picedit/picture/PictureChangeListener.java b/src/com/agifans/picedit/picture/PictureChangeListener.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/PictureChangeListener.java
rename to src/com/agifans/picedit/picture/PictureChangeListener.java
diff --git a/picedit/src/com/agifans/picedit/picture/PictureCode.java b/src/com/agifans/picedit/picture/PictureCode.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/PictureCode.java
rename to src/com/agifans/picedit/picture/PictureCode.java
diff --git a/picedit/src/com/agifans/picedit/picture/PictureCodeType.java b/src/com/agifans/picedit/picture/PictureCodeType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/picture/PictureCodeType.java
rename to src/com/agifans/picedit/picture/PictureCodeType.java
diff --git a/picedit/src/com/agifans/picedit/types/BrushShape.java b/src/com/agifans/picedit/types/BrushShape.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/BrushShape.java
rename to src/com/agifans/picedit/types/BrushShape.java
diff --git a/picedit/src/com/agifans/picedit/types/BrushTexture.java b/src/com/agifans/picedit/types/BrushTexture.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/BrushTexture.java
rename to src/com/agifans/picedit/types/BrushTexture.java
diff --git a/picedit/src/com/agifans/picedit/types/BrushType.java b/src/com/agifans/picedit/types/BrushType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/BrushType.java
rename to src/com/agifans/picedit/types/BrushType.java
diff --git a/picedit/src/com/agifans/picedit/types/ColourType.java b/src/com/agifans/picedit/types/ColourType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/ColourType.java
rename to src/com/agifans/picedit/types/ColourType.java
diff --git a/picedit/src/com/agifans/picedit/types/PictureType.java b/src/com/agifans/picedit/types/PictureType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/PictureType.java
rename to src/com/agifans/picedit/types/PictureType.java
diff --git a/picedit/src/com/agifans/picedit/types/StepType.java b/src/com/agifans/picedit/types/StepType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/StepType.java
rename to src/com/agifans/picedit/types/StepType.java
diff --git a/picedit/src/com/agifans/picedit/types/ToolType.java b/src/com/agifans/picedit/types/ToolType.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/types/ToolType.java
rename to src/com/agifans/picedit/types/ToolType.java
diff --git a/picedit/src/com/agifans/picedit/utils/EgaPalette.java b/src/com/agifans/picedit/utils/EgaPalette.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/utils/EgaPalette.java
rename to src/com/agifans/picedit/utils/EgaPalette.java
diff --git a/picedit/src/com/agifans/picedit/utils/OSChecker.java b/src/com/agifans/picedit/utils/OSChecker.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/utils/OSChecker.java
rename to src/com/agifans/picedit/utils/OSChecker.java
diff --git a/picedit/src/com/agifans/picedit/view/Cell.java b/src/com/agifans/picedit/view/Cell.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/view/Cell.java
rename to src/com/agifans/picedit/view/Cell.java
diff --git a/picedit/src/com/agifans/picedit/view/EgoTestHandler.java b/src/com/agifans/picedit/view/EgoTestHandler.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/view/EgoTestHandler.java
rename to src/com/agifans/picedit/view/EgoTestHandler.java
diff --git a/picedit/src/com/agifans/picedit/view/Loop.java b/src/com/agifans/picedit/view/Loop.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/view/Loop.java
rename to src/com/agifans/picedit/view/Loop.java
diff --git a/picedit/src/com/agifans/picedit/view/View.java b/src/com/agifans/picedit/view/View.java
similarity index 100%
rename from picedit/src/com/agifans/picedit/view/View.java
rename to src/com/agifans/picedit/view/View.java
diff --git a/picedit/src/com/agifans/picedit/view/view.000 b/src/com/agifans/picedit/view/view.000
similarity index 100%
rename from picedit/src/com/agifans/picedit/view/view.000
rename to src/com/agifans/picedit/view/view.000