diff --git a/.gitignore b/.gitignore
index 9ac3fcc77..56edc512a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,6 @@
 /sdk/jme3-vehicle-creator/build/
 /sdk/jme3-welcome-screen/build/
 /sdk/jme3-glsl-support/build/
-/netbeans/
\ No newline at end of file
+/netbeans/
+/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip
+/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip
\ No newline at end of file
diff --git a/sdk/build.xml b/sdk/build.xml
index 9296df047..a20dfb3f2 100644
--- a/sdk/build.xml
+++ b/sdk/build.xml
@@ -60,7 +60,7 @@
             <exclude name="**/dist/"/>
             <exclude name="**/nbproject/private/"/>
         </zip>
-        <zip basedir="JME3TestsTemplateAndroid/" destfile="jme3-templates/src/com/jme3/gde/templates/JME3TestsAndroidProject.zip">
+        <zip basedir="JME3TestsTemplateAndroid/" destfile="jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip">
             <exclude name="**/build/"/>
             <exclude name="**/dist/"/>
             <exclude name="**/mobile/assets/"/>
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip b/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip
index cea1beea7..063f5461f 100644
Binary files a/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip and b/sdk/jme3-templates/src/com/jme3/gde/templates/BasicGameProject.zip differ
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties b/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties
index de29ba9d8..7e30db593 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties
+++ b/sdk/jme3-templates/src/com/jme3/gde/templates/Bundle.properties
@@ -5,4 +5,3 @@ OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Name=Project Templates
 OpenIDE-Module-Short-Description=Provides Project Templates
 Templates/Project/JME3/BasicGameProject.zip=BasicGame
-Templates/Project/JME3/JME3TestsAndroidProject.zip=JME3 Tests Android
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/layer.xml b/sdk/jme3-templates/src/com/jme3/gde/templates/layer.xml
index a296d5262..dde0bd2ee 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/layer.xml
+++ b/sdk/jme3-templates/src/com/jme3/gde/templates/layer.xml
@@ -12,13 +12,6 @@
                     <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/basic/BasicGameDescription.html"/>
                     <attr name="template" boolvalue="true"/>
                 </file>
-                <file name="JME3TestsAndroidProject.zip" url="JME3TestsAndroidProject.zip">
-                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/com/jme3/gde/templates/phone16.png"/>
-                    <attr name="displayName" bundlevalue="com.jme3.gde.templates.Bundle#Templates/Project/JME3/JME3TestsAndroidProject.zip"/>
-                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.testsandroid.JME3TestsAndroidWizardIterator.createIterator"/>
-                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/testsandroid/JME3TestsAndroidDescription.html"/>
-                    <attr name="template" boolvalue="true"/>
-                </file>
             </folder>
         </folder>
         <folder name="JME3 Classes">
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/Bundle.properties b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/Bundle.properties
index 564b4b5ca..e41423669 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/Bundle.properties
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/Bundle.properties
@@ -5,8 +5,4 @@ OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Name=Tests Template
 OpenIDE-Module-Short-Description=Provides Project Template with jME3 Tests
 Templates/Project/JME3/JmeTestsProject.zip=JME3 Tests
-JmeTestsPanelVisual.browseButton.text=Br&owse...
-JmeTestsPanelVisual.createdFolderLabel.text=Project &Folder:
-JmeTestsPanelVisual.projectLocationLabel.text=Project &Location:
-JmeTestsPanelVisual.projectNameLabel.text=Project &Name:
-JmeTestsPanelVisual.browseButton.actionCommand=BROWSE
+Templates/Project/JME3/JME3TestsAndroidProject.zip=JME3 Tests Android
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/layer.xml b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/layer.xml
index 75852cbe9..ef63728cb 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/layer.xml
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/layer.xml
@@ -6,8 +6,15 @@
             <folder name="JME3">
                 <file name="JmeTestsProject.zip" url="JmeTestsProject.zip">
                     <attr name="displayName" bundlevalue="com.jme3.gde.templates.tests.Bundle#Templates/Project/JME3/JmeTestsProject.zip"/>
-                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.JmeTestsWizardIterator.createIterator"/>
-                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/JmeTestsDescription.html"/>
+                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.testsdesktop.JmeTestsWizardIterator.createIterator"/>
+                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsdesktop/JmeTestsDescription.html"/>
+                    <attr name="template" boolvalue="true"/>
+                </file>
+                <file name="JME3TestsAndroidProject.zip" url="JME3TestsAndroidProject.zip">
+                    <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsandroid/phone16.png"/>
+                    <attr name="displayName" bundlevalue="com.jme3.gde.templates.tests.Bundle#Templates/Project/JME3/JME3TestsAndroidProject.zip"/>
+                    <attr name="instantiatingIterator" methodvalue="com.jme3.gde.templates.tests.testsandroid.JME3TestsAndroidWizardIterator.createIterator"/>
+                    <attr name="instantiatingWizardURL" urlvalue="nbresloc:/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidDescription.html"/>
                     <attr name="template" boolvalue="true"/>
                 </file>
             </folder>
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/Bundle.properties b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/Bundle.properties
similarity index 100%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/Bundle.properties
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/Bundle.properties
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidDescription.html b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidDescription.html
similarity index 100%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidDescription.html
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidDescription.html
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidPanelVisual.form b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.form
similarity index 100%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidPanelVisual.form
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.form
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidPanelVisual.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.java
similarity index 99%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidPanelVisual.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.java
index 7990fea05..069cb4d39 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidPanelVisual.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidPanelVisual.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.io.File;
 import javax.swing.JFileChooser;
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardIterator.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardIterator.java
similarity index 99%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardIterator.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardIterator.java
index 5b394af4c..decd6a110 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardIterator.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardIterator.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.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.awt.Component;
 import java.io.ByteArrayInputStream;
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardPanel.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardPanel.java
similarity index 98%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardPanel.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardPanel.java
index 26f61c800..226c80b7d 100644
--- a/sdk/jme3-templates/src/com/jme3/gde/templates/testsandroid/JME3TestsAndroidWizardPanel.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/JME3TestsAndroidWizardPanel.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.templates.testsandroid;
+package com.jme3.gde.templates.tests.testsandroid;
 
 import java.awt.Component;
 import java.util.HashSet;
diff --git a/sdk/jme3-templates/src/com/jme3/gde/templates/phone16.png b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/phone16.png
similarity index 100%
rename from sdk/jme3-templates/src/com/jme3/gde/templates/phone16.png
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsandroid/phone16.png
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties
new file mode 100644
index 000000000..189077573
--- /dev/null
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties
@@ -0,0 +1,9 @@
+# To change this license header, choose License Headers in Project Properties.
+# To change this template file, choose Tools | Templates
+# and open the template in the editor.
+
+JmeTestsPanelVisual.projectNameLabel.text=Project &Name:
+JmeTestsPanelVisual.projectLocationLabel.text=Project &Location:
+JmeTestsPanelVisual.browseButton.actionCommand=BROWSE
+JmeTestsPanelVisual.browseButton.text=Br&owse...
+JmeTestsPanelVisual.createdFolderLabel.text=Project &Folder:
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsDescription.html b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsDescription.html
similarity index 100%
rename from sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsDescription.html
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsDescription.html
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.form b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.form
similarity index 83%
rename from sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.form
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.form
index 7e5fd5e2b..91a666572 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.form
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
@@ -66,7 +66,7 @@
           <ComponentRef name="projectNameTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.projectNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.projectNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -81,7 +81,7 @@
           <ComponentRef name="projectLocationTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.projectLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.projectLocationLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <AuxValues>
@@ -93,10 +93,10 @@
     <Component class="javax.swing.JButton" name="browseButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.browseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="actionCommand" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.browseButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.browseButton.actionCommand" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -109,7 +109,7 @@
           <ComponentRef name="createdFolderTextField"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/jme3/gde/templates/tests/Bundle.properties" key="JmeTestsPanelVisual.createdFolderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="com/jme3/gde/templates/tests/testsdesktop/Bundle.properties" key="JmeTestsPanelVisual.createdFolderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.java
similarity index 99%
rename from sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.java
index ce0ed0af0..4b673d643 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsPanelVisual.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsPanelVisual.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.io.File;
 import javax.swing.JFileChooser;
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardIterator.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardIterator.java
similarity index 99%
rename from sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardIterator.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardIterator.java
index 409346d1f..6b853dac3 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardIterator.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardIterator.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.awt.Component;
 import java.io.ByteArrayInputStream;
diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardPanel.java b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardPanel.java
similarity index 97%
rename from sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardPanel.java
rename to sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardPanel.java
index cfb287e1a..483c427ea 100644
--- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsWizardPanel.java
+++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/JmeTestsWizardPanel.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.jme3.gde.templates.tests;
+package com.jme3.gde.templates.tests.testsdesktop;
 
 import java.awt.Component;
 import java.util.HashSet;