diff --git a/de.bmotionstudio.gef.editor/plugin.xml b/de.bmotionstudio.gef.editor/plugin.xml
index c35d015c9eb64762a163ee3f1d98ed1a135be6de..1b0173811f8dd4b63dd1bcd00bf5fba26ac8b17a 100644
--- a/de.bmotionstudio.gef.editor/plugin.xml
+++ b/de.bmotionstudio.gef.editor/plugin.xml
@@ -13,13 +13,13 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="de.bmotionstudio.rodin.PerspectiveEditFactory"
+            class="de.bmotionstudio.gef.editor.internal.PerspectiveEditFactory"
             icon="icons/logo_bmotion.png"
             id="de.bmotionstudio.perspective.edit"
             name="BMS Edit">
       </perspective>
       <perspective
-            class="de.bmotionstudio.rodin.PerspectiveRunFactory"
+            class="de.bmotionstudio.gef.editor.internal.PerspectiveRunFactory"
             icon="icons/icon_run.png"
             id="de.bmotionstudio.perspective.run"
             name="BMS Run">
@@ -122,7 +122,7 @@
                   <iterate
                         operator="or">
                      <instanceof
-                           value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+                           value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
                      </instanceof>
                   </iterate>
                </with>
@@ -142,7 +142,7 @@
             name="Start Visualization from File">
       </command>
       <command
-            defaultHandler="de.bmotionstudio.rodin.StartEventBVisualizationHandler"
+            defaultHandler="de.bmotionstudio.gef.editor.handler.StartEventBVisualizationHandler"
             id="de.bmotionstudio.rodin.command.startVisualization"
             name="Start Visualization">
       </command>
@@ -165,9 +165,9 @@
    <extension
          point="org.eclipse.ui.navigator.navigatorContent">
       <navigatorContent
-            contentProvider="de.bmotionstudio.rodin.BMotionStudioContentProvider"
+            contentProvider="de.bmotionstudio.gef.editor.internal.BMotionStudioContentProvider"
             id="de.bmotionstudio.ui.navigatorContent"
-            labelProvider="de.bmotionstudio.rodin.BMotionLabelProvider"
+            labelProvider="de.bmotionstudio.gef.editor.internal.BMotionLabelProvider"
             name="BMotion Studio Navigator Content"
             priority="normal">
          <triggerPoints>
@@ -177,15 +177,15 @@
          </triggerPoints>
          <possibleChildren>
             <instanceof
-                  value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+                  value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
             </instanceof>
          </possibleChildren>
          <actionProvider
-               class="de.bmotionstudio.rodin.BMotionStudioActionProvider"
+               class="de.bmotionstudio.gef.editor.action.BMotionStudioActionProvider"
                id="de.bmotionstudio.ui.navigatorAction"
                priority="normal">
             <enablement>
-               <instanceof value="de.bmotionstudio.rodin.BMotionStudioRodinFile">
+               <instanceof value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile">
                </instanceof>
             </enablement>
          </actionProvider>
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java
similarity index 97%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java
index b70999a3c7f292bd21ac025b275a98ff4c8a7678..6b5be76d9d94005aba4f53736770c1e4373c57ad 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.action;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,6 +30,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite;
 import org.eclipse.ui.part.FileEditorInput;
 
 import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
+import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile;
 
 public class ActionCollection {
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java
similarity index 95%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java
index e6b1ca715fd09baa7f3fc3c6332cd0dbaf47411c..6d2f467a8ddeff516de67f20fe07f2a940383403 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.action;
 
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IMenuManager;
@@ -20,6 +20,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite;
 import org.eclipse.ui.navigator.ICommonMenuConstants;
 
 import de.bmotionstudio.gef.editor.BMotionEditorPlugin;
+import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile;
 
 public class BMotionStudioActionProvider extends CommonActionProvider {
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java
similarity index 96%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java
index ed59926eed3da61f0afaa3d2fcec23d93557e0ca..643ab8b99aacd9adf9e45a21465cfa453642c79c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.action;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java
similarity index 91%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java
index 73fdccadfa2dac75a95554de9becd38b45f02744..3f78d94425c5b4b4991243adbcf228ad3c34c230 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.handler;
 
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.resources.IFile;
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
-import de.bmotionstudio.gef.editor.handler.StartVisualizationFileHandler;
+import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile;
 
 /**
  * @author Lukas Ladenberger
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java
similarity index 96%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java
index 06ae49b37bd6eaff0b4d36a737d3a0fc671be1e1..925bdc09b3ec6f8b265a66abe096f3981af6f701 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.internal;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java
similarity index 97%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java
index ed93b697f873ae0669827c3e7029206951467e5a..ce9ebd9591167d32f0cf8de73584f1ec6c8f7bc1 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java
similarity index 92%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java
index 6286b03e5ce1410a60546697cca103f803318e17..77ff770e0c956a263fafe98d2e8dc2a07f988d08 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.internal;
 
 import org.eclipse.core.resources.IResource;
 
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java
similarity index 96%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java
index 35a2c477e1ef878b5d40b7a4c796cc53687ebc5c..2603fee362ae80c07df25e5b1caf8e9e4f367193 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.internal;
 
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java
similarity index 96%
rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java
rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java
index f8c425f52aae636d0d7d086bde4a3868d87aa411..7586a12d5e625a3928e1ff3346fe7a7e5640c0d6 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java
@@ -4,7 +4,7 @@
  * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) 
  * */
 
-package de.bmotionstudio.rodin;
+package de.bmotionstudio.gef.editor.internal;
 
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;