diff --git a/plugin.xml b/plugin.xml
index 59de3a7..e9069c2 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -70,7 +70,7 @@
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="opaide.editors.launch.OpaClassicConfigurationDelegate"
+            delegate="opaide.editors.launch.configuration.OpaClassicConfigurationDelegate"
             id="opaide.launchConfigurationType"
             modes="run"
             name="Opa Application"
@@ -119,7 +119,7 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="opaide.editors.launch.OpaClassicLaunchConfigurationTabGroup"
+            class="opaide.editors.launch.configuration.OpaClassicLaunchConfigurationTabGroup"
             id="opaide.launchConfigurationTabGroup"
             type="opaide.launchConfigurationType">
       </launchConfigurationTabGroup>
diff --git a/src/opaide/editors/launch/OpaClassicConfigurationDelegate.java b/src/opaide/editors/launch/configuration/OpaClassicConfigurationDelegate.java
similarity index 97%
rename from src/opaide/editors/launch/OpaClassicConfigurationDelegate.java
rename to src/opaide/editors/launch/configuration/OpaClassicConfigurationDelegate.java
index e3505e6..0a7a80f 100644
--- a/src/opaide/editors/launch/OpaClassicConfigurationDelegate.java
+++ b/src/opaide/editors/launch/configuration/OpaClassicConfigurationDelegate.java
@@ -1,4 +1,4 @@
-package opaide.editors.launch;
+package opaide.editors.launch.configuration;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/src/opaide/editors/launch/OpaClassicLaunchConfigurationConstants.java b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationConstants.java
similarity index 84%
rename from src/opaide/editors/launch/OpaClassicLaunchConfigurationConstants.java
rename to src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationConstants.java
index f12078f..e0f3e83 100644
--- a/src/opaide/editors/launch/OpaClassicLaunchConfigurationConstants.java
+++ b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationConstants.java
@@ -1,4 +1,4 @@
-package opaide.editors.launch;
+package opaide.editors.launch.configuration;
 
 public enum OpaClassicLaunchConfigurationConstants {
 	
diff --git a/src/opaide/editors/launch/OpaClassicLaunchConfigurationTab.java b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTab.java
similarity index 99%
rename from src/opaide/editors/launch/OpaClassicLaunchConfigurationTab.java
rename to src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTab.java
index b87a59e..c49521e 100644
--- a/src/opaide/editors/launch/OpaClassicLaunchConfigurationTab.java
+++ b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTab.java
@@ -1,4 +1,4 @@
-package opaide.editors.launch;
+package opaide.editors.launch.configuration;
 
 
 import java.awt.FileDialog;
diff --git a/src/opaide/editors/launch/OpaClassicLaunchConfigurationTabGroup.java b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTabGroup.java
similarity index 95%
rename from src/opaide/editors/launch/OpaClassicLaunchConfigurationTabGroup.java
rename to src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTabGroup.java
index ab70bde..ad947ea 100644
--- a/src/opaide/editors/launch/OpaClassicLaunchConfigurationTabGroup.java
+++ b/src/opaide/editors/launch/configuration/OpaClassicLaunchConfigurationTabGroup.java
@@ -1,4 +1,4 @@
-package opaide.editors.launch;
+package opaide.editors.launch.configuration;
 
 
 import org.eclipse.debug.ui.*;