diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/Bundle.properties b/sdk/jme3-core/src/com/jme3/gde/core/codeless/Bundle.properties
similarity index 100%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/Bundle.properties
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/Bundle.properties
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardAction.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java
similarity index 99%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardAction.java
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java
index 283f072fd..c8f859851 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardAction.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardAction.java
@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.core.codeless.wizard;
+package com.jme3.gde.core.codeless;
 
 import com.jme3.gde.core.codeless.CodelessProjectFactory;
 import java.awt.Component;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.form b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.form
similarity index 82%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.form
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.form
index a0b3209bf..5d1f419e7 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.form
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.form
@@ -53,7 +53,7 @@
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
             <TitledBorder title="Information">
-              <ResourceString PropertyName="titleX" bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jPanel1.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString PropertyName="titleX" bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jPanel1.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>
         </Property>
@@ -93,28 +93,28 @@
         <Component class="javax.swing.JLabel" name="jLabel5">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel6">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel6.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel7">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel7.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel7.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel8">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel8.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -126,7 +126,7 @@
           <Font name="Lucida Grande" size="12" style="0"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
@@ -141,7 +141,7 @@
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -163,14 +163,14 @@
         <Component class="javax.swing.JTextField" name="jTextField1">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="jButton1">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -190,7 +190,7 @@
         <Component class="javax.swing.JLabel" name="jLabel2">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
@@ -217,14 +217,14 @@
         <Component class="javax.swing.JTextField" name="jTextField2">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jTextField2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jTextField2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="jButton2">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jButton2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jButton2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -239,7 +239,7 @@
           <Font name="Lucida Grande" size="12" style="0"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel1.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.java
similarity index 99%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.java
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.java
index 4d964d15f..8345cfd68 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel1.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel1.java
@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.core.codeless.wizard;
+package com.jme3.gde.core.codeless;
 
 import java.awt.event.ActionListener;
 import java.io.File;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.form b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.form
similarity index 89%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.form
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.form
index 48fae529e..327a62b92 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.form
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.form
@@ -37,7 +37,7 @@
     <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/core/codeless/wizard/Bundle.properties" key="CodelessProjectWizardVisualPanel2.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/core/codeless/Bundle.properties" key="CodelessProjectWizardVisualPanel2.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.java
similarity index 98%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.java
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.java
index b7eba26eb..6cc5942a4 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardVisualPanel2.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardVisualPanel2.java
@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.core.codeless.wizard;
+package com.jme3.gde.core.codeless;
 
 import javax.swing.JPanel;
 
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java
similarity index 99%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel1.java
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java
index a057ab4b7..0cca4f378 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel1.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel1.java
@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.core.codeless.wizard;
+package com.jme3.gde.core.codeless;
 
 import java.awt.Component;
 import java.awt.event.ActionListener;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel2.java b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel2.java
similarity index 99%
rename from sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel2.java
rename to sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel2.java
index 1d14a321a..5866a8db7 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/codeless/wizard/CodelessProjectWizardWizardPanel2.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/codeless/CodelessProjectWizardWizardPanel2.java
@@ -29,7 +29,7 @@
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.jme3.gde.core.codeless.wizard;
+package com.jme3.gde.core.codeless;
 
 import java.awt.Component;
 import javax.swing.event.ChangeListener;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java
index f1ce35099..0f0c45009 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/AbstractSceneExplorerNode.java
@@ -31,7 +31,7 @@
  */
 package com.jme3.gde.core.sceneexplorer.nodes;
 
-import com.jme3.gde.core.nodes.DynamicLookup;
+import com.jme3.gde.core.util.DynamicLookup;
 import com.jme3.gde.core.properties.SceneExplorerProperty;
 import com.jme3.gde.core.properties.ScenePropertyChangeListener;
 import com.jme3.gde.core.util.PropertyUtils;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java
index be1d25606..ac23e9e06 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeGenericControl.java
@@ -31,7 +31,7 @@
  */
 package com.jme3.gde.core.sceneexplorer.nodes;
 
-import com.jme3.gde.core.nodes.DynamicLookup;
+import com.jme3.gde.core.util.DynamicLookup;
 import com.jme3.gde.core.scene.SceneApplication;
 import com.jme3.gde.core.properties.SceneExplorerProperty;
 import com.jme3.gde.core.properties.ScenePropertyChangeListener;
diff --git a/sdk/jme3-core/src/com/jme3/gde/core/nodes/DynamicLookup.java b/sdk/jme3-core/src/com/jme3/gde/core/util/DynamicLookup.java
similarity index 98%
rename from sdk/jme3-core/src/com/jme3/gde/core/nodes/DynamicLookup.java
rename to sdk/jme3-core/src/com/jme3/gde/core/util/DynamicLookup.java
index b2e6bc338..b164e5054 100644
--- a/sdk/jme3-core/src/com/jme3/gde/core/nodes/DynamicLookup.java
+++ b/sdk/jme3-core/src/com/jme3/gde/core/util/DynamicLookup.java
@@ -30,7 +30,7 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.jme3.gde.core.nodes;
+package com.jme3.gde.core.util;
 
 import org.openide.util.lookup.AbstractLookup;
 import org.openide.util.lookup.InstanceContent;