diff --git a/jme3-jbullet/build.gradle b/jme3-jbullet/build.gradle
index 4eb74ea546..39bb120368 100644
--- a/jme3-jbullet/build.gradle
+++ b/jme3-jbullet/build.gradle
@@ -2,7 +2,6 @@ sourceSets {
     main {
         java {
             srcDir 'src/main/java'
-            srcDir '../jme3-bullet/src/common/java'
         }
     }
     test {
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/BulletAppState.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/PhysicsTickListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/PhysicsTickListener.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsTickListener.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/BoneLink.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/BoneLink.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/BoneLink.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/DacConfiguration.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacConfiguration.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/DacConfiguration.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacConfiguration.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/DacLinks.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/DacLinks.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/DacLinks.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/DynamicAnimControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/DynamicAnimControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/DynamicAnimControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/KinematicSubmode.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/KinematicSubmode.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/KinematicSubmode.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/PhysicsLink.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/PhysicsLink.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/PhysicsLink.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/PhysicsLink.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/RagUtils.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/RagUtils.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagUtils.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/RagdollCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/RagdollCollisionListener.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/RagdollCollisionListener.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/RangeOfMotion.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/RangeOfMotion.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/RangeOfMotion.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/TorsoLink.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/TorsoLink.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/TorsoLink.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/VectorSet.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/VectorSet.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/VectorSet.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/animation/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/animation/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/animation/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/animation/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionGroupListener.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/PhysicsCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionListener.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/RagdollCollisionListener.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/RagdollCollisionListener.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/RagdollCollisionListener.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/collision/shapes/infos/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/infos/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/AbstractPhysicsControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/AbstractPhysicsControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/BetterCharacterControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/BetterCharacterControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/CharacterControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/CharacterControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/GhostControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/GhostControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/KinematicRagdollControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/KinematicRagdollControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/PhysicsControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/PhysicsControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/PhysicsControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/RigidBodyControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/VehicleControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/VehicleControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/HumanoidRagdollPreset.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollPreset.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/RagdollUtils.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/control/ragdoll/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/control/ragdoll/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/AbstractPhysicsDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletCharacterDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletDebugAppState.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletDebugAppState.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletDebugAppState.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletJointDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletJointDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletJointDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/BulletVehicleDebugControl.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/DebugTools.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/DebugTools.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/DebugTools.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/debug/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/debug/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/debug/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/debug/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/package-info.java b/jme3-jbullet/src/main/java/com/jme3/bullet/package-info.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/package-info.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/package-info.java
diff --git a/jme3-bullet/src/common/java/com/jme3/bullet/util/CollisionShapeFactory.java b/jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java
similarity index 100%
rename from jme3-bullet/src/common/java/com/jme3/bullet/util/CollisionShapeFactory.java
rename to jme3-jbullet/src/main/java/com/jme3/bullet/util/CollisionShapeFactory.java