diff --git a/sdk/jme3-core-baselibs/manifest.mf b/sdk/jme3-core-baselibs/manifest.mf
index 610ce52d2..bf8f98504 100644
--- a/sdk/jme3-core-baselibs/manifest.mf
+++ b/sdk/jme3-core-baselibs/manifest.mf
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: com.jme3.gde.core.baselibs/1
 OpenIDE-Module-Implementation-Version: 0
-OpenIDE-Module-Layer: com/jme3/gde/core/baselibs/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/jme3/gde/core/baselibs/Bundle.properties
 
diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties
index b7fd10483..1b1c32b3b 100644
--- a/sdk/jme3-core-baselibs/nbproject/genfiles.properties
+++ b/sdk/jme3-core-baselibs/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0b0a6a78
+build.xml.data.CRC32=278ea45d
 build.xml.script.CRC32=cdae6a36
-build.xml.stylesheet.CRC32=a56c6a5b@2.66.1
+build.xml.stylesheet.CRC32=a56c6a5b@2.67.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=0b0a6a78
+nbproject/build-impl.xml.data.CRC32=278ea45d
 nbproject/build-impl.xml.script.CRC32=246f9b81
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml
index 15badc4fd..df81e68ff 100644
--- a/sdk/jme3-core-baselibs/nbproject/project.xml
+++ b/sdk/jme3-core-baselibs/nbproject/project.xml
@@ -19,131 +19,133 @@
       <public-packages>
         <package>com.jme3.asset</package>
         <package>com.jme3.scene.plugins.blender</package>
-        <package>com.jme3.scene.plugins.blender.materials</package>
-        <package>com.jme3.scene.plugins.blender.file</package>
+        <package>com.jme3.scene.plugins.blender.animations</package>
+        <package>com.jme3.scene.plugins.blender.cameras</package>
         <package>com.jme3.scene.plugins.blender.constraints</package>
         <package>com.jme3.scene.plugins.blender.constraints.definitions</package>
-        <package>com.jme3.scene.plugins.blender.meshes</package>
-        <package>com.jme3.scene.plugins.blender.particles</package>
-        <package>com.jme3.scene.plugins.blender.lights</package>
         <package>com.jme3.scene.plugins.blender.curves</package>
-        <package>com.jme3.scene.plugins.blender.objects</package>
+        <package>com.jme3.scene.plugins.blender.file</package>
         <package>com.jme3.scene.plugins.blender.landscape</package>
-        <package>com.jme3.scene.plugins.blender.cameras</package>
+        <package>com.jme3.scene.plugins.blender.lights</package>
+        <package>com.jme3.scene.plugins.blender.materials</package>
+        <package>com.jme3.scene.plugins.blender.math</package>
+        <package>com.jme3.scene.plugins.blender.meshes</package>
+        <package>com.jme3.scene.plugins.blender.modifiers</package>
+        <package>com.jme3.scene.plugins.blender.objects</package>
+        <package>com.jme3.scene.plugins.blender.particles</package>
         <package>com.jme3.scene.plugins.blender.textures</package>
-        <package>com.jme3.scene.plugins.blender.textures.generating</package>
         <package>com.jme3.scene.plugins.blender.textures.blending</package>
+        <package>com.jme3.scene.plugins.blender.textures.generating</package>
         <package>com.jme3.scene.plugins.blender.textures.io</package>
-        <package>com.jme3.scene.plugins.blender.animations</package>
-        <package>com.jme3.scene.plugins.blender.modifiers</package>
         <package>checkers.quals</package>
-        <package>jme3tools.optimize</package>
-        <package>jme3tools.shadercheck</package>
-        <package>jme3tools.converters</package>
-        <package>jme3tools.converters.model</package>
-        <package>jme3tools.converters.model.strip</package>
-        <package>jme3tools.shader</package>
-        <package>jme3tools.savegame</package>
-        <package>com.jme3.cursors.plugins</package>
+        <package>com.jme3.animation</package>
         <package>com.jme3.app</package>
         <package>com.jme3.app.state</package>
-        <package>com.jme3.texture</package>
-        <package>com.jme3.texture.plugins</package>
-        <package>com.jme3.texture.image</package>
-        <package>com.jme3.shadow</package>
-        <package>com.jme3.effect</package>
-        <package>com.jme3.effect.influencers</package>
-        <package>com.jme3.effect.shapes</package>
+        <package>com.jme3.asset.cache</package>
+        <package>com.jme3.asset.plugins</package>
         <package>com.jme3.audio</package>
         <package>com.jme3.audio.openal</package>
         <package>com.jme3.audio.plugins</package>
-        <package>com.jme3.light</package>
+        <package>com.jme3.bounding</package>
         <package>com.jme3.cinematic</package>
         <package>com.jme3.cinematic.events</package>
+        <package>com.jme3.collision</package>
+        <package>com.jme3.collision.bih</package>
+        <package>com.jme3.cursors.plugins</package>
+        <package>com.jme3.effect</package>
+        <package>com.jme3.effect.influencers</package>
+        <package>com.jme3.effect.shapes</package>
+        <package>com.jme3.export</package>
+        <package>com.jme3.export.binary</package>
+        <package>com.jme3.font</package>
+        <package>com.jme3.font.plugins</package>
         <package>com.jme3.input</package>
+        <package>com.jme3.input.controls</package>
         <package>com.jme3.input.dummy</package>
         <package>com.jme3.input.event</package>
-        <package>com.jme3.input.controls</package>
-        <package>com.jme3.asset.plugins</package>
-        <package>com.jme3.asset.cache</package>
-        <package>com.jme3.export</package>
-        <package>com.jme3.export.binary</package>
+        <package>com.jme3.light</package>
+        <package>com.jme3.material</package>
+        <package>com.jme3.material.plugins</package>
+        <package>com.jme3.math</package>
+        <package>com.jme3.post</package>
+        <package>com.jme3.profile</package>
+        <package>com.jme3.renderer</package>
+        <package>com.jme3.renderer.opengl</package>
+        <package>com.jme3.renderer.queue</package>
         <package>com.jme3.scene</package>
+        <package>com.jme3.scene.control</package>
+        <package>com.jme3.scene.debug</package>
         <package>com.jme3.scene.instancing</package>
         <package>com.jme3.scene.mesh</package>
         <package>com.jme3.scene.plugins</package>
-        <package>com.jme3.scene.debug</package>
-        <package>com.jme3.scene.control</package>
         <package>com.jme3.scene.shape</package>
-        <package>com.jme3.font</package>
-        <package>com.jme3.font.plugins</package>
+        <package>com.jme3.shader</package>
+        <package>com.jme3.shader.plugins</package>
+        <package>com.jme3.shadow</package>
         <package>com.jme3.system</package>
-        <package>com.jme3.collision</package>
-        <package>com.jme3.collision.bih</package>
+        <package>com.jme3.texture</package>
+        <package>com.jme3.texture.image</package>
+        <package>com.jme3.texture.plugins</package>
+        <package>com.jme3.ui</package>
         <package>com.jme3.util</package>
-        <package>com.jme3.util.xml</package>
         <package>com.jme3.util.blockparser</package>
-        <package>com.jme3.bounding</package>
-        <package>com.jme3.profile</package>
-        <package>com.jme3.post</package>
-        <package>com.jme3.renderer</package>
-        <package>com.jme3.renderer.queue</package>
-        <package>com.jme3.ui</package>
-        <package>com.jme3.material</package>
-        <package>com.jme3.material.plugins</package>
-        <package>com.jme3.animation</package>
-        <package>com.jme3.shader</package>
-        <package>com.jme3.shader.plugins</package>
-        <package>com.jme3.math</package>
-        <package>jme3tools.navigation</package>
+        <package>com.jme3.util.xml</package>
+        <package>jme3tools.converters</package>
+        <package>jme3tools.converters.model</package>
+        <package>jme3tools.converters.model.strip</package>
+        <package>jme3tools.optimize</package>
+        <package>jme3tools.savegame</package>
+        <package>jme3tools.shader</package>
+        <package>jme3tools.shadercheck</package>
         <package>com.jme3.input.awt</package>
         <package>com.jme3.system.awt</package>
-        <package>com.jme3.water</package>
+        <package>jme3tools.navigation</package>
         <package>com.jme3.post.filters</package>
         <package>com.jme3.post.ssao</package>
+        <package>com.jme3.water</package>
         <package>com.jme3.bullet</package>
-        <package>com.jme3.bullet.debug</package>
-        <package>com.jme3.bullet.objects</package>
-        <package>com.jme3.bullet.objects.infos</package>
-        <package>com.jme3.bullet.control</package>
-        <package>com.jme3.bullet.control.ragdoll</package>
         <package>com.jme3.bullet.collision</package>
         <package>com.jme3.bullet.collision.shapes</package>
         <package>com.jme3.bullet.collision.shapes.infos</package>
-        <package>com.jme3.bullet.util</package>
+        <package>com.jme3.bullet.control</package>
+        <package>com.jme3.bullet.control.ragdoll</package>
+        <package>com.jme3.bullet.debug</package>
         <package>com.jme3.bullet.joints</package>
         <package>com.jme3.bullet.joints.motors</package>
+        <package>com.jme3.bullet.objects</package>
+        <package>com.jme3.bullet.objects.infos</package>
+        <package>com.jme3.bullet.util</package>
         <package>com.jme3.audio.lwjgl</package>
         <package>com.jme3.input.lwjgl</package>
-        <package>com.jme3.system.lwjgl</package>
         <package>com.jme3.renderer.lwjgl</package>
+        <package>com.jme3.system.lwjgl</package>
         <package>com.jme3.network</package>
-        <package>com.jme3.network.serializing</package>
-        <package>com.jme3.network.serializing.serializers</package>
-        <package>com.jme3.network.rmi</package>
+        <package>com.jme3.network.base</package>
         <package>com.jme3.network.kernel</package>
-        <package>com.jme3.network.kernel.udp</package>
         <package>com.jme3.network.kernel.tcp</package>
-        <package>com.jme3.network.base</package>
+        <package>com.jme3.network.kernel.udp</package>
         <package>com.jme3.network.message</package>
+        <package>com.jme3.network.rmi</package>
+        <package>com.jme3.network.serializing</package>
+        <package>com.jme3.network.serializing.serializers</package>
         <package>com.jme3.niftygui</package>
         <package>com.jme3.export.xml</package>
-        <package>com.jme3.scene.plugins.ogre</package>
-        <package>com.jme3.scene.plugins.ogre.matext</package>
         <package>com.jme3.scene.plugins.fbx</package>
         <package>com.jme3.scene.plugins.fbx.file</package>
+        <package>com.jme3.scene.plugins.ogre</package>
+        <package>com.jme3.scene.plugins.ogre.matext</package>
         <package>com.jme3.terrain</package>
-        <package>com.jme3.terrain.noise</package>
-        <package>com.jme3.terrain.noise.basis</package>
-        <package>com.jme3.terrain.noise.modulator</package>
-        <package>com.jme3.terrain.noise.filter</package>
-        <package>com.jme3.terrain.noise.fractal</package>
         <package>com.jme3.terrain.geomipmap</package>
-        <package>com.jme3.terrain.geomipmap.picking</package>
         <package>com.jme3.terrain.geomipmap.grid</package>
         <package>com.jme3.terrain.geomipmap.lodcalc</package>
         <package>com.jme3.terrain.geomipmap.lodcalc.util</package>
+        <package>com.jme3.terrain.geomipmap.picking</package>
         <package>com.jme3.terrain.heightmap</package>
+        <package>com.jme3.terrain.noise</package>
+        <package>com.jme3.terrain.noise.basis</package>
+        <package>com.jme3.terrain.noise.filter</package>
+        <package>com.jme3.terrain.noise.fractal</package>
+        <package>com.jme3.terrain.noise.modulator</package>
       </public-packages>
       <class-path-extension>
         <runtime-relative-path>ext/jme3-blender-3.1.0-snapshot-github.jar</runtime-relative-path>
diff --git a/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/layer.xml b/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/layer.xml
deleted file mode 100644
index c16a8a0fe..000000000
--- a/sdk/jme3-core-baselibs/src/com/jme3/gde/core/baselibs/layer.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
-<filesystem>
-</filesystem>
diff --git a/sdk/jme3-core-libraries/manifest.mf b/sdk/jme3-core-libraries/manifest.mf
index a4343d76c..13213625a 100644
--- a/sdk/jme3-core-libraries/manifest.mf
+++ b/sdk/jme3-core-libraries/manifest.mf
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: com.jme3.gde.core.libraries/1
 OpenIDE-Module-Implementation-Version: 0
-OpenIDE-Module-Layer: com/jme3/gde/core/libraries/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/jme3/gde/core/libraries/Bundle.properties
 
diff --git a/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/layer.xml b/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/layer.xml
deleted file mode 100644
index 3af08d7e2..000000000
--- a/sdk/jme3-core-libraries/src/com/jme3/gde/core/libraries/layer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
-<filesystem>
-    
-</filesystem>
\ No newline at end of file
diff --git a/sdk/jme3-project-libraries/manifest.mf b/sdk/jme3-project-libraries/manifest.mf
index c56bdace0..c09ab86cd 100644
--- a/sdk/jme3-project-libraries/manifest.mf
+++ b/sdk/jme3-project-libraries/manifest.mf
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: com.jme3.gde.project.libraries/1
 OpenIDE-Module-Implementation-Version: 0
-OpenIDE-Module-Layer: com/jme3/gde/project/libraries/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/jme3/gde/project/libraries/Bundle.properties
 
diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml
deleted file mode 100644
index c16a8a0fe..000000000
--- a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
-<filesystem>
-</filesystem>