diff --git a/engine/src/android/com/jme3/app/AndroidHarness.java b/engine/src/android/com/jme3/app/AndroidHarness.java
index 1bb81f2db..c26406848 100644
--- a/engine/src/android/com/jme3/app/AndroidHarness.java
+++ b/engine/src/android/com/jme3/app/AndroidHarness.java
@@ -1,9 +1,5 @@
 package com.jme3.app;
 
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import com.jme3.util.JmeFormatter;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -14,15 +10,18 @@ import android.view.Display;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
-
 import com.jme3.input.android.AndroidInput;
 import com.jme3.input.controls.TouchListener;
 import com.jme3.input.event.TouchEvent;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeSystem;
-import com.jme3.system.android.OGLESContext;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
 import com.jme3.system.android.JmeAndroidSystem;
+import com.jme3.system.android.OGLESContext;
+import com.jme3.util.JmeFormatter;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <code>AndroidHarness</code> wraps a jme application object and runs it on Android
diff --git a/engine/src/android/com/jme3/app/android/AndroidApplication.java b/engine/src/android/com/jme3/app/android/AndroidApplication.java
index f39aa82c8..0db53da36 100644
--- a/engine/src/android/com/jme3/app/android/AndroidApplication.java
+++ b/engine/src/android/com/jme3/app/android/AndroidApplication.java
@@ -31,13 +31,10 @@
  */
 package com.jme3.app.android;
 
-import java.nio.CharBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import com.jme3.app.AndroidHarness;
 import com.jme3.app.Application;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
@@ -53,7 +50,9 @@ import com.jme3.scene.Spatial.CullHint;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeSystem;
 import com.jme3.util.FastInteger;
-import com.jme3.app.AndroidHarness;
+import java.nio.CharBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
 
 
 /**
diff --git a/engine/src/android/com/jme3/asset/AndroidAssetManager.java b/engine/src/android/com/jme3/asset/AndroidAssetManager.java
index 77734f190..92bc02ad0 100644
--- a/engine/src/android/com/jme3/asset/AndroidAssetManager.java
+++ b/engine/src/android/com/jme3/asset/AndroidAssetManager.java
@@ -31,16 +31,15 @@
  */
 package com.jme3.asset;
 
-import com.jme3.texture.Texture;
-import com.jme3.texture.plugins.AndroidImageLoader;
-import java.net.URL;
-import java.util.logging.Logger;
-
 import com.jme3.asset.plugins.AndroidLocator;
 import com.jme3.asset.plugins.ClasspathLocator;
 import com.jme3.audio.plugins.AndroidAudioLoader;
+import com.jme3.texture.Texture;
+import com.jme3.texture.plugins.AndroidImageLoader;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * <code>AndroidAssetManager</code> is an implementation of DesktopAssetManager for Android
diff --git a/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java b/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
index b978e418a..682fa3d9f 100644
--- a/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
+++ b/engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
@@ -38,27 +38,11 @@ import android.content.res.AssetManager;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.SoundPool;
-
-
-import com.jme3.audio.AudioKey;
-import com.jme3.audio.ListenerParam;
-import com.jme3.audio.AudioParam;
-
-import com.jme3.audio.AudioData;
-import com.jme3.audio.AudioRenderer;
-import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode.Status;
-
-import com.jme3.audio.Environment;
-import com.jme3.audio.Filter;
-import com.jme3.audio.Listener;
-
+import com.jme3.audio.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-
-
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
diff --git a/engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java b/engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java
index 4c20619c7..5448a0112 100644
--- a/engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java
+++ b/engine/src/android/com/jme3/audio/plugins/AndroidAudioLoader.java
@@ -1,11 +1,10 @@
 package com.jme3.audio.plugins;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.audio.android.AndroidAudioData;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class AndroidAudioLoader implements AssetLoader 
 {
diff --git a/engine/src/android/com/jme3/input/android/AndroidInput.java b/engine/src/android/com/jme3/input/android/AndroidInput.java
index 790e40339..1cee26865 100644
--- a/engine/src/android/com/jme3/input/android/AndroidInput.java
+++ b/engine/src/android/com/jme3/input/android/AndroidInput.java
@@ -1,7 +1,5 @@
 package com.jme3.input.android;
 
-import java.util.HashMap;
-import java.util.logging.Logger;
 import android.content.Context;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
@@ -18,6 +16,8 @@ import com.jme3.input.event.TouchEvent;
 import com.jme3.input.event.TouchEvent.Type;
 import com.jme3.math.Vector2f;
 import com.jme3.util.RingBuffer;
+import java.util.HashMap;
+import java.util.logging.Logger;
 
 
 /**
diff --git a/engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java b/engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java
index 11dbf0aff..34e4592b7 100644
--- a/engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java
+++ b/engine/src/android/com/jme3/input/android/AndroidTouchInputListener.java
@@ -1,10 +1,9 @@
 package com.jme3.input.android;
 
-import com.jme3.input.RawInputListener;
-import com.jme3.input.event.TouchEvent;
-
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import com.jme3.input.RawInputListener;
+import com.jme3.input.event.TouchEvent;
 
 /**
  * AndroidTouchInputListener is an inputlistener interface which defines callbacks/events for android touch screens
diff --git a/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java b/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
index fbdbb4eaf..dbb63ab62 100644
--- a/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
+++ b/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
@@ -31,26 +31,21 @@
  */
 package com.jme3.renderer.android;
 
+import android.graphics.Bitmap;
+import android.opengl.GLES10;
+import android.opengl.GLES11;
+import android.opengl.GLES20;
+import android.os.Build;
 import com.jme3.light.LightList;
 import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.Caps;
-import com.jme3.util.NativeObjectManager;
-import com.jme3.renderer.IDList;
-import com.jme3.renderer.Renderer;
+import com.jme3.math.*;
+import com.jme3.renderer.*;
 import com.jme3.scene.Mesh;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
-import com.jme3.renderer.RenderContext;
-import com.jme3.renderer.RendererException;
-import com.jme3.renderer.Statistics;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.shader.Attribute;
 import com.jme3.shader.Shader;
 import com.jme3.shader.Shader.ShaderSource;
@@ -65,25 +60,15 @@ import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import com.jme3.util.ListMap;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import com.jme3.util.NativeObjectManager;
+import java.nio.*;
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.microedition.khronos.opengles.GL10;
 
-import android.graphics.Bitmap;
-import android.opengl.GLES10;
-import android.opengl.GLES11;
-import android.opengl.GLES20;
-import android.os.Build;
-import java.util.ArrayList;
-
 public class OGLESShaderRenderer implements Renderer {
 
     private static final Logger logger = Logger.getLogger(OGLESShaderRenderer.class.getName());
diff --git a/engine/src/android/com/jme3/system/android/AndroidConfigChooser.java b/engine/src/android/com/jme3/system/android/AndroidConfigChooser.java
index ecd4f64a6..e55fa55a0 100644
--- a/engine/src/android/com/jme3/system/android/AndroidConfigChooser.java
+++ b/engine/src/android/com/jme3/system/android/AndroidConfigChooser.java
@@ -1,14 +1,12 @@
 package com.jme3.system.android;
 
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView.EGLConfigChooser;
 import java.util.logging.Logger;
-
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLDisplay;
 
-import android.graphics.PixelFormat;
-import android.opengl.GLSurfaceView.EGLConfigChooser;
-
 /**
  * AndroidConfigChooser is used to determine the best suited EGL Config
  * @author larynx
diff --git a/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java b/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
index 6363f279c..cda752979 100644
--- a/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
+++ b/engine/src/android/com/jme3/system/android/JmeAndroidSystem.java
@@ -2,22 +2,21 @@ package com.jme3.system.android;
 
 import android.app.Activity;
 import android.content.res.Resources;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeContext;
-import com.jme3.system.Platform;
-import com.jme3.util.AndroidLogHandler;
 import com.jme3.asset.AndroidAssetManager;
 import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioRenderer;
 import com.jme3.audio.android.AndroidAudioRenderer;
+import com.jme3.system.AppSettings;
+import com.jme3.system.JmeContext;
 import com.jme3.system.JmeContext.Type;
 import com.jme3.system.JmeSystemDelegate;
+import com.jme3.system.Platform;
+import com.jme3.util.AndroidLogHandler;
 import com.jme3.util.JmeFormatter;
+import java.net.URL;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 
-import java.net.URL;
-
 public class JmeAndroidSystem extends JmeSystemDelegate{
 
     private static Resources res;
diff --git a/engine/src/android/com/jme3/system/android/OGLESContext.java b/engine/src/android/com/jme3/system/android/OGLESContext.java
index 1ccc79ab5..7efb0a964 100644
--- a/engine/src/android/com/jme3/system/android/OGLESContext.java
+++ b/engine/src/android/com/jme3/system/android/OGLESContext.java
@@ -34,12 +34,8 @@ package com.jme3.system.android;
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.PixelFormat;
-import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
-import android.opengl.GLSurfaceView.EGLConfigChooser;
 import android.view.SurfaceHolder;
-
 import com.jme3.app.AndroidHarness;
 import com.jme3.app.Application;
 import com.jme3.input.JoyInput;
@@ -56,10 +52,8 @@ import com.jme3.system.JmeContext;
 import com.jme3.system.SystemListener;
 import com.jme3.system.Timer;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
-
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
-
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLContext;
@@ -313,8 +307,8 @@ public class OGLESContext implements JmeContext, GLSurfaceView.Renderer
     }
     
     protected void applySettings(AppSettings settings)
-    {
-        setSettings(settings);
+    {
+        setSettings(settings);
         if (renderer != null)
             applySettingsToRenderer(renderer, this.settings);        
     }
diff --git a/engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java b/engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java
index 3718ad989..25852a885 100644
--- a/engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java
+++ b/engine/src/android/com/jme3/texture/plugins/AndroidImageLoader.java
@@ -3,7 +3,6 @@ package com.jme3.texture.plugins;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.TextureKey;
diff --git a/engine/src/android/jme3test/android/DemoAndroidHarness.java b/engine/src/android/jme3test/android/DemoAndroidHarness.java
index 10b33d388..0a431cfee 100644
--- a/engine/src/android/jme3test/android/DemoAndroidHarness.java
+++ b/engine/src/android/jme3test/android/DemoAndroidHarness.java
@@ -2,7 +2,6 @@ package jme3test.android;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
-
 import com.jme3.app.AndroidHarness;
 import com.jme3.system.android.AndroidConfigChooser.ConfigType;
 
diff --git a/engine/src/android/jme3test/android/DemoLaunchAdapter.java b/engine/src/android/jme3test/android/DemoLaunchAdapter.java
index 3c74c8da6..9d4c9de66 100644
--- a/engine/src/android/jme3test/android/DemoLaunchAdapter.java
+++ b/engine/src/android/jme3test/android/DemoLaunchAdapter.java
@@ -1,14 +1,13 @@
 package jme3test.android;
 
-import java.util.List;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
+import java.util.List;
 
 /**
  * The view adapter which gets a list of LaunchEntries and displaqs them
diff --git a/engine/src/android/jme3test/android/DemoMainActivity.java b/engine/src/android/jme3test/android/DemoMainActivity.java
index b7433a744..dfc88aa0d 100644
--- a/engine/src/android/jme3test/android/DemoMainActivity.java
+++ b/engine/src/android/jme3test/android/DemoMainActivity.java
@@ -1,19 +1,14 @@
 package jme3test.android;
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.Toast;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class DemoMainActivity extends Activity {
 
diff --git a/engine/src/android/jme3test/android/SimpleTexturedTest.java b/engine/src/android/jme3test/android/SimpleTexturedTest.java
index 82c6596e2..d57980f0b 100644
--- a/engine/src/android/jme3test/android/SimpleTexturedTest.java
+++ b/engine/src/android/jme3test/android/SimpleTexturedTest.java
@@ -8,35 +8,20 @@
 package jme3test.android;
 
 
-import java.util.List;
-import java.util.ArrayList;
-
 import com.jme3.app.SimpleApplication;
-
 import com.jme3.asset.TextureKey;
-
+import com.jme3.light.PointLight;
 import com.jme3.material.Material;
-
-import com.jme3.math.Transform;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
-
+import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Sphere;
 import com.jme3.scene.shape.Box;
-
+import com.jme3.scene.shape.Sphere;
 import com.jme3.texture.Texture;
-
-import com.jme3.light.PointLight;
-
 import com.jme3.util.TangentBinormalGenerator;
 
-import jme3tools.converters.model.ModelConverter;
-
-import java.awt.font.*;
-
 
 public class SimpleTexturedTest extends SimpleApplication {
 
diff --git a/engine/src/android/jme3test/android/TestAmbient.java b/engine/src/android/jme3test/android/TestAmbient.java
index d062efec1..50ca73962 100644
--- a/engine/src/android/jme3test/android/TestAmbient.java
+++ b/engine/src/android/jme3test/android/TestAmbient.java
@@ -32,19 +32,10 @@
 
 package jme3test.android;
 
-import android.app.Activity;
-import android.media.AudioManager;
 import android.media.SoundPool;
-
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.audio.AudioNode;
-import com.jme3.audio.Listener;
-//import com.jme3.audio.PointAudioSource;
-import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeSystem;
 
 public class TestAmbient extends SimpleApplication {
 
diff --git a/engine/src/android/jme3test/android/TestBumpModel.java b/engine/src/android/jme3test/android/TestBumpModel.java
index ec9506517..196286f9d 100644
--- a/engine/src/android/jme3test/android/TestBumpModel.java
+++ b/engine/src/android/jme3test/android/TestBumpModel.java
@@ -33,7 +33,6 @@
 package jme3test.android;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetKey;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
diff --git a/engine/src/android/jme3test/android/TestMovingParticle.java b/engine/src/android/jme3test/android/TestMovingParticle.java
index c34c3994e..eda7db9b8 100644
--- a/engine/src/android/jme3test/android/TestMovingParticle.java
+++ b/engine/src/android/jme3test/android/TestMovingParticle.java
@@ -34,10 +34,8 @@ package jme3test.android;
 import com.jme3.app.SimpleApplication;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.InputListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.AmbientLight;
 import com.jme3.material.Material;
diff --git a/engine/src/blender/com/jme3/asset/BlenderKey.java b/engine/src/blender/com/jme3/asset/BlenderKey.java
index 77ca44509..821a61163 100644
--- a/engine/src/blender/com/jme3/asset/BlenderKey.java
+++ b/engine/src/blender/com/jme3/asset/BlenderKey.java
@@ -31,11 +31,6 @@
  */
 package com.jme3.asset;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
@@ -54,6 +49,10 @@ import com.jme3.scene.SceneGraphVisitor;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.ogre.AnimData;
 import com.jme3.texture.Texture;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
 
 /**
  * Blender key. Contains path of the blender file and its loading properties.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java
index 5d0209bac..ba43384dc 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderHelper.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.nio.FloatBuffer;
-import java.util.List;
-
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
@@ -41,6 +38,8 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.Properties;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.List;
 
 /**
  * A purpose of the helper class is to split calculation code into several classes. Each helper after use should be cleared because it can
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java b/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
index 22696c712..b42f76078 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/AbstractBlenderLoader.java
@@ -31,10 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetLoader;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.asset.BlenderKey.WorldData;
@@ -54,6 +50,9 @@ import com.jme3.scene.plugins.blender.lights.LightHelper;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class converts blender file blocks into jMonkeyEngine data structures.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
index b008199fa..2971795b0 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderContext.java
@@ -31,16 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.BlenderKey;
 import com.jme3.material.Material;
@@ -54,6 +44,10 @@ import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.materials.MaterialContext;
 import com.jme3.scene.plugins.blender.meshes.MeshContext;
 import com.jme3.scene.plugins.blender.modifiers.Modifier;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * The class that stores temporary data and manages it during loading the belnd file. This class is intended to be used
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
index 49998293f..dd5011dfd 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
@@ -31,12 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.BlenderKey;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
@@ -63,6 +57,11 @@ import com.jme3.scene.plugins.blender.modifiers.ModifierHelper;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.plugins.blender.particles.ParticlesHelper;
 import com.jme3.scene.plugins.blender.textures.TextureHelper;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This is the main loading class. Have in notice that asset manager needs to have loaders for resources like textures.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java
index 09e9cb72f..ec117d8fb 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/BlenderModelLoader.java
@@ -31,10 +31,6 @@
  */
 package com.jme3.scene.plugins.blender;
 
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.BlenderKey;
 import com.jme3.light.Light;
@@ -42,6 +38,9 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This is the main loading class. Have in notice that asset manager needs to have loaders for resources like textures.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
index 067dbd2b8..85c6c0f6e 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/ArmatureHelper.java
@@ -31,16 +31,8 @@
  */
 package com.jme3.scene.plugins.blender.animations;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Bone;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
@@ -48,11 +40,13 @@ import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.curves.BezierCurve;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-import com.jme3.scene.plugins.blender.file.BlenderInputStream;
-import com.jme3.scene.plugins.blender.file.DynamicArray;
-import com.jme3.scene.plugins.blender.file.FileBlockHeader;
-import com.jme3.scene.plugins.blender.file.Pointer;
-import com.jme3.scene.plugins.blender.file.Structure;
+import com.jme3.scene.plugins.blender.file.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class defines the methods to calculate certain aspects of animation and armature functionalities.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java b/engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java
index 7b4dd48b7..90994ccf1 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/CalculationBone.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.animations;
 
-import java.util.Arrays;
-
 import com.jme3.animation.Bone;
 import com.jme3.animation.BoneTrack;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import java.util.Arrays;
 
 /**
  * The purpose of this class is to imitate bone's movement when calculating inverse kinematics.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
index 9b12c3e2b..9069d323c 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/animations/IpoHelper.java
@@ -1,7 +1,5 @@
 package com.jme3.scene.plugins.blender.animations;
 
-import java.util.List;
-
 import com.jme3.animation.BoneTrack;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
@@ -9,6 +7,7 @@ import com.jme3.scene.plugins.blender.curves.BezierCurve;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.List;
 
 /**
  * This class helps to compute values from interpolation curves for features like animation or constraint influence. The
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java
index e4a907731..40f67d859 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/cameras/CameraHelper.java
@@ -1,14 +1,13 @@
 package com.jme3.scene.plugins.blender.cameras;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * A class that is used to load cameras into the scene.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java
index 351b5af45..5f3219542 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintAction.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Action' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java
index 213778eb4..c29c0db72 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintChildOf.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'ChildOf' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java
index b48d4348c..09577f1db 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintClampTo.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Clamp to' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java
index 891898845..c8725d44b 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintDistLimit.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java
index 63e018a2a..05d3db2ab 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintFollowPath.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Follow path' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
index 2ec07d5b5..3e5a58f47 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintHelper.java
@@ -1,11 +1,5 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
@@ -13,6 +7,11 @@ import com.jme3.scene.plugins.blender.animations.IpoHelper;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * This class should be used for constraint calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java
index c2cfc7471..744b8efa3 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintInverseKinematics.java
@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Inverse kinematics' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java
index dac463dc5..3561de528 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLike.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java
index 4e2df2241..0352354be 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLocLimit.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java
index 07422adc4..b0d8bcadc 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintLockTrack.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Action' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java
index 95eb11e4d..9c331fa4d 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintMinMax.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Min max' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java
index 89e664376..d8a6ba15f 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintPython.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Python' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java
index a8949a199..0fe2795ef 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRigidBodyJoint.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Rigid body joint' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java
index 397e349cf..ba652d9dd 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLike.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java
index a5447c68b..90749ed5d 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintRotLimit.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.scene.plugins.blender.BlenderContext;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
index 332405d0d..770903b13 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintShrinkWrap.java
@@ -1,13 +1,7 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
@@ -20,6 +14,10 @@ import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Shrink wrap' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java
index b8fa27836..348f11c65 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLike.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java
index 51796a8c0..b8bf6a4d1 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintSizeLimit.java
@@ -2,7 +2,6 @@ package com.jme3.scene.plugins.blender.constraints;
 
 import com.jme3.animation.Animation;
 import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Track;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java
index 2349637f7..ecbe4c758 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintStretchTo.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Stretch to' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java
index da001fb04..7839fbc79 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/constraints/ConstraintTransform.java
@@ -1,13 +1,12 @@
 package com.jme3.scene.plugins.blender.constraints;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.Animation;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class represents 'Transform' constraint type in blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java b/engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java
index e4df671cb..ebf609646 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/curves/BezierCurve.java
@@ -1,11 +1,10 @@
 package com.jme3.scene.plugins.blender.curves;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.math.Vector3f;
 import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A class that helps to calculate the bezier curves calues. It uses doubles for performing calculations to minimize
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
index a7dc96498..d867136f0 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/curves/CurvesHelper.java
@@ -1,40 +1,30 @@
 package com.jme3.scene.plugins.blender.curves;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
-
 import com.jme3.material.Material;
 import com.jme3.material.RenderState.FaceCullMode;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Spline;
 import com.jme3.math.Spline.SplineType;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.math.*;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-import com.jme3.scene.plugins.blender.file.BlenderInputStream;
-import com.jme3.scene.plugins.blender.file.DynamicArray;
-import com.jme3.scene.plugins.blender.file.FileBlockHeader;
-import com.jme3.scene.plugins.blender.file.Pointer;
-import com.jme3.scene.plugins.blender.file.Structure;
+import com.jme3.scene.plugins.blender.file.*;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.objects.Properties;
 import com.jme3.scene.shape.Curve;
 import com.jme3.scene.shape.Surface;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Logger;
 
 /**
  * A class that is used in mesh calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java b/engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java
index e9660789d..d764b1b79 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/file/BlenderInputStream.java
@@ -31,6 +31,8 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
+import com.jme3.asset.AssetManager;
+import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -38,9 +40,6 @@ import java.io.InputStream;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
-import com.jme3.asset.AssetManager;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * An input stream with random access to data.
  * @author Marcin Roguski
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java b/engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java
index 75e6c848c..30922beef 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/file/DnaBlockData.java
@@ -31,11 +31,10 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The data block containing the description of the file.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java b/engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java
index ca0272014..ef7802d9b 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/file/Field.java
@@ -1,11 +1,10 @@
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure.DataType;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This class represents a single field in the structure. It can be either a primitive type or a table or a reference to
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java b/engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java
index 147a43c01..af700b655 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/file/Pointer.java
@@ -31,11 +31,10 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A class that represents a pointer of any level that can be stored in the file.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java b/engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java
index df7682900..d9bacce5b 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/file/Structure.java
@@ -31,14 +31,13 @@
  */
 package com.jme3.scene.plugins.blender.file;
 
+import com.jme3.scene.plugins.blender.BlenderContext;
+import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
-
 /**
  * A class representing a single structure in the file.
  * @author Marcin Roguski
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java
index 776c029d2..341602af4 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/lights/LightHelper.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.lights;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -46,6 +43,8 @@ import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.BlenderContext.LoadedFeatureDataType;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * A class that is used in light calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
index 57cccf4ed..3dff16b70 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
@@ -1,13 +1,5 @@
 package com.jme3.scene.plugins.blender.materials;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
@@ -20,6 +12,13 @@ import com.jme3.scene.plugins.blender.textures.TextureHelper;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.Type;
 import com.jme3.texture.Texture.WrapMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class holds the data about the material.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
index d172216da..6b7a6288e 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialHelper.java
@@ -31,14 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.materials;
 
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.material.MatParam;
 import com.jme3.material.MatParamTexture;
@@ -60,6 +52,13 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.Type;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class MaterialHelper extends AbstractBlenderHelper {
 	private static final Logger					LOGGER					= Logger.getLogger(MaterialHelper.class.getName());
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java
index 859617e1a..de43db7c8 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshContext.java
@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.meshes;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.VertexBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Class that holds information about the mesh.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
index a664f49e6..0c8433432 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java
@@ -31,14 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.meshes;
 
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
@@ -65,6 +57,9 @@ import com.jme3.scene.plugins.blender.textures.TextureHelper;
 import com.jme3.scene.plugins.blender.textures.UVCoordinatesGenerator;
 import com.jme3.texture.Texture;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * A class that is used in mesh calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
index 62e383e5b..1ac1144ed 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java
@@ -1,21 +1,6 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.jme3.animation.AnimControl;
-import com.jme3.animation.Animation;
-import com.jme3.animation.Bone;
-import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Skeleton;
-import com.jme3.animation.SkeletonControl;
-import com.jme3.animation.Track;
+import com.jme3.animation.*;
 import com.jme3.math.Matrix4f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@@ -37,6 +22,14 @@ import com.jme3.scene.plugins.blender.meshes.MeshContext;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.plugins.ogre.AnimData;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to add bone animation to the object.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java
index bfa5e0e73..4997fdc25 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArrayModifier.java
@@ -1,12 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
@@ -24,6 +17,12 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
 import com.jme3.scene.shape.Curve;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to array modifier to the object.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java
index ef06eff92..d44147666 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/MirrorModifier.java
@@ -1,14 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@@ -20,6 +11,14 @@ import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.objects.ObjectHelper;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to array modifier to the object.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
index 51af62269..b089bacf1 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ModifierHelper.java
@@ -31,17 +31,16 @@
  */
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * A class that is used in modifiers calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
index a0f655e9a..b66b0aa26 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ObjectAnimationModifier.java
@@ -1,16 +1,8 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
-import com.jme3.animation.BoneTrack;
 import com.jme3.animation.SpatialTrack;
-import com.jme3.animation.Track;
 import com.jme3.scene.Node;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.animations.Ipo;
@@ -21,6 +13,11 @@ import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.ogre.AnimData;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to add animation to the object.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java
index 4a5134d67..5a61eb653 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ParticlesModifier.java
@@ -1,10 +1,5 @@
 package com.jme3.scene.plugins.blender.modifiers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.shapes.EmitterMeshVertexShape;
 import com.jme3.effect.shapes.EmitterShape;
@@ -19,6 +14,10 @@ import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.materials.MaterialHelper;
 import com.jme3.scene.plugins.blender.particles.ParticlesHelper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This modifier allows to add particles to the object.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
index 67775b395..7ddfc353f 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
@@ -31,12 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.objects;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
@@ -65,6 +59,11 @@ import com.jme3.scene.plugins.blender.lights.LightHelper;
 import com.jme3.scene.plugins.blender.meshes.MeshHelper;
 import com.jme3.scene.plugins.blender.modifiers.Modifier;
 import com.jme3.scene.plugins.blender.modifiers.ModifierHelper;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * A class that is used in object calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java b/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
index b2deef147..9c4a2d6d5 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/objects/Properties.java
@@ -1,22 +1,18 @@
 package com.jme3.scene.plugins.blender.objects;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.scene.plugins.blender.file.FileBlockHeader;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * The blender object's custom properties.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java
index 8d3e1f91f..8ae84ac6a 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/particles/ParticlesHelper.java
@@ -1,12 +1,10 @@
 package com.jme3.scene.plugins.blender.particles;
 
-import java.util.logging.Logger;
-
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
 import com.jme3.effect.influencers.EmptyParticleInfluencer;
-import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.influencers.NewtonianParticleInfluencer;
+import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.shapes.EmitterMeshConvexHullShape;
 import com.jme3.effect.shapes.EmitterMeshFaceShape;
 import com.jme3.effect.shapes.EmitterMeshVertexShape;
@@ -17,6 +15,7 @@ import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
 import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
+import java.util.logging.Logger;
 
 public class ParticlesHelper extends AbstractBlenderHelper {
 	private static final Logger			LOGGER		= Logger.getLogger(ParticlesHelper.class.getName());
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java
index 37f76e9af..d124616d0 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/ImageLoader.java
@@ -31,14 +31,13 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.io.InputStream;
-import java.util.logging.Logger;
-
 import com.jme3.scene.plugins.blender.file.BlenderInputStream;
 import com.jme3.texture.Image;
 import com.jme3.texture.plugins.AWTLoader;
 import com.jme3.texture.plugins.DDSLoader;
 import com.jme3.texture.plugins.TGALoader;
+import java.io.InputStream;
+import java.util.logging.Logger;
 
 /**
  * An image loader class. It uses three loaders (AWTLoader, TGALoader and DDSLoader) in an attempt to load the image from the given
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java
index a3d8800ff..c129662a7 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/NoiseGenerator.java
@@ -31,6 +31,11 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
+import com.jme3.math.FastMath;
+import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
+import com.jme3.scene.plugins.blender.BlenderContext;
+import com.jme3.scene.plugins.blender.file.Structure;
+import com.jme3.scene.plugins.blender.textures.TextureGeneratorMusgrave.MusgraveData;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -39,12 +44,6 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.math.FastMath;
-import com.jme3.scene.plugins.blender.AbstractBlenderHelper;
-import com.jme3.scene.plugins.blender.BlenderContext;
-import com.jme3.scene.plugins.blender.file.Structure;
-import com.jme3.scene.plugins.blender.textures.TextureGeneratorMusgrave.MusgraveData;
-
 /**
  * This generator is responsible for creating various noises used to create
  * generated textures loaded from blender.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java
index 8bf852c49..a7272770e 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGenerator.java
@@ -31,11 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.exceptions.BlenderFileException;
@@ -43,6 +38,10 @@ import com.jme3.scene.plugins.blender.file.DynamicArray;
 import com.jme3.scene.plugins.blender.file.Pointer;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.texture.Texture;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class is a base class for texture generators.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java
index aa31fb055..18ef40921 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorBlend.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'blend' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java
index 8be396831..9ac24e5f9 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorClouds.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'clouds' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java
index f4a549ec2..f66beb6e0 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorDistnoise.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -43,6 +40,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'distorted noise' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java
index 3b8c009d7..e8a1637e1 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMagic.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'magic' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java
index 45b56fa31..06c08a911 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMarble.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.texture.Image;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'marble' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java
index 6b794ff8c..667063f69 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorMusgrave.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.scene.plugins.blender.textures.NoiseGenerator.MusgraveFunction;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'musgrave' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java
index 832532156..02d4687e1 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorNoise.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -42,6 +39,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'noise' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java
index 50651c405..76a6614d6 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorStucci.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
 import com.jme3.texture.Image;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'stucci' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java
index ffc96d882..1dee1586e 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorVoronoi.java
@@ -31,9 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -43,6 +40,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'voronoi' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java
index 51ee5b48d..bf5e050cc 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureGeneratorWood.java
@@ -30,9 +30,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
 import com.jme3.math.FastMath;
 import com.jme3.scene.plugins.blender.BlenderContext;
 import com.jme3.scene.plugins.blender.file.Structure;
@@ -41,6 +38,8 @@ import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 
 /**
  * This class generates the 'wood' texture.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
index 98ca0971f..0b6ba6bf7 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
@@ -31,25 +31,8 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorConvertOp;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import jme3tools.converters.ImageToAwt;
-
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import com.jme3.asset.BlenderKey;
 import com.jme3.asset.BlenderKey.FeaturesToLoad;
-import com.jme3.asset.GeneratedTextureKey;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
@@ -70,6 +53,17 @@ import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
 import com.jme3.texture.Texture3D;
 import com.jme3.util.BufferUtils;
+import java.awt.color.ColorSpace;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorConvertOp;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * A class that is used in texture calculations.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java
index 2481ace10..9b3ac15ad 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/TexturePixel.java
@@ -1,12 +1,11 @@
 package com.jme3.scene.plugins.blender.textures;
 
+import com.jme3.math.ColorRGBA;
+import com.jme3.texture.Image.Format;
 import java.nio.ByteBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.math.ColorRGBA;
-import com.jme3.texture.Image.Format;
-
 /*package*/ class TexturePixel implements Cloneable {
 	private static final Logger LOGGER = Logger.getLogger(TexturePixel.class.getName());
 	
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
index 9db50e431..56e429310 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVCoordinatesGenerator.java
@@ -31,10 +31,6 @@
  */
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.FloatBuffer;
-import java.util.List;
-import java.util.logging.Logger;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
@@ -46,6 +42,9 @@ import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.util.BufferUtils;
+import java.nio.FloatBuffer;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * This class is used for UV coordinates generation.
diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java b/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java
index 00615574d..4412d608a 100644
--- a/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java
+++ b/engine/src/blender/com/jme3/scene/plugins/blender/textures/UVProjectionGenerator.java
@@ -1,7 +1,5 @@
 package com.jme3.scene.plugins.blender.textures;
 
-import java.nio.FloatBuffer;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.math.FastMath;
@@ -10,6 +8,7 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.plugins.blender.textures.UVCoordinatesGenerator.BoundingTube;
+import java.nio.FloatBuffer;
 
 /**
  * This class helps with projection calculations.
diff --git a/engine/src/bullet-common/com/jme3/bullet/BulletAppState.java b/engine/src/bullet-common/com/jme3/bullet/BulletAppState.java
index 753441bb4..f6d24f41e 100644
--- a/engine/src/bullet-common/com/jme3/bullet/BulletAppState.java
+++ b/engine/src/bullet-common/com/jme3/bullet/BulletAppState.java
@@ -10,11 +10,7 @@ import com.jme3.app.state.AppStateManager;
 import com.jme3.bullet.PhysicsSpace.BroadphaseType;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java b/engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
index cc721d0f1..02230181e 100644
--- a/engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
+++ b/engine/src/bullet-common/com/jme3/bullet/collision/shapes/infos/ChildCollisionShape.java
@@ -6,11 +6,7 @@ package com.jme3.bullet.collision.shapes.infos;
 
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
 import java.io.IOException;
diff --git a/engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java b/engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java
index 3470153c8..1da04428b 100644
--- a/engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java
+++ b/engine/src/bullet-common/com/jme3/bullet/control/KinematicRagdollControl.java
@@ -31,8 +31,6 @@
  */
 package com.jme3.bullet.control;
 
-import com.jme3.bullet.control.ragdoll.RagdollPreset;
-import com.jme3.bullet.control.ragdoll.HumanoidRagdollPreset;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Bone;
 import com.jme3.animation.Skeleton;
@@ -45,6 +43,8 @@ import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.RagdollCollisionListener;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.HullCollisionShape;
+import com.jme3.bullet.control.ragdoll.HumanoidRagdollPreset;
+import com.jme3.bullet.control.ragdoll.RagdollPreset;
 import com.jme3.bullet.control.ragdoll.RagdollUtils;
 import com.jme3.bullet.joints.SixDofJoint;
 import com.jme3.bullet.objects.PhysicsRigidBody;
@@ -59,13 +59,7 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java b/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java
index be40b58c3..25bc95980 100644
--- a/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java
+++ b/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java
@@ -20,7 +20,6 @@ import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
 import com.jme3.scene.shape.Box;
diff --git a/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java b/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java
index 4e6f416e4..b86cd2b3d 100644
--- a/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java
+++ b/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java
@@ -6,7 +6,6 @@ package com.jme3.bullet.control;
 
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.bullet.joints.PhysicsJoint;
 import com.jme3.bullet.objects.PhysicsVehicle;
 import com.jme3.bullet.objects.VehicleWheel;
 import com.jme3.export.InputCapsule;
diff --git a/engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java b/engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java
index 7aeb3a901..02bab98c3 100644
--- a/engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java
+++ b/engine/src/bullet-common/com/jme3/bullet/control/ragdoll/RagdollUtils.java
@@ -18,12 +18,7 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.VertexBuffer.Type;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  *
diff --git a/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java
index 7357f10dc..b0031f228 100644
--- a/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java
@@ -32,21 +32,12 @@
 package com.jme3.bullet.util;
 
 import com.jme3.bounding.BoundingBox;
-import com.jme3.bullet.collision.shapes.BoxCollisionShape;
-import com.jme3.bullet.collision.shapes.CollisionShape;
-import com.jme3.bullet.collision.shapes.CompoundCollisionShape;
-import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape;
-import com.jme3.bullet.collision.shapes.HullCollisionShape;
-import com.jme3.bullet.collision.shapes.MeshCollisionShape;
+import com.jme3.bullet.collision.shapes.*;
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.UserData;
+import com.jme3.scene.*;
 import com.jme3.terrain.geomipmap.TerrainPatch;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import java.util.Iterator;
diff --git a/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java b/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
index 29f60526c..14cc6351f 100644
--- a/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
+++ b/engine/src/bullet/com/jme3/bullet/PhysicsSpace.java
@@ -33,23 +33,17 @@ package com.jme3.bullet;
 
 import com.jme3.app.AppTask;
 import com.jme3.asset.AssetManager;
-import com.jme3.math.Vector3f;
-import com.jme3.bullet.collision.PhysicsCollisionEvent;
-import com.jme3.bullet.collision.PhysicsCollisionEventFactory;
-import com.jme3.bullet.collision.PhysicsCollisionGroupListener;
-import com.jme3.bullet.collision.PhysicsCollisionListener;
-import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.bullet.collision.PhysicsRayTestResult;
-import com.jme3.bullet.collision.PhysicsSweepTestResult;
+import com.jme3.bullet.collision.*;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.control.PhysicsControl;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.bullet.joints.PhysicsJoint;
-import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsCharacter;
-import com.jme3.bullet.objects.PhysicsVehicle;
+import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsRigidBody;
+import com.jme3.bullet.objects.PhysicsVehicle;
 import com.jme3.math.Transform;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import java.util.Iterator;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java b/engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
index 3ccd09802..5e1d65e22 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
@@ -34,11 +34,7 @@ package com.jme3.bullet.collision;
 import com.jme3.asset.AssetManager;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.DebugShapeFactory;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
index 94d6ea4f3..bfcf28792 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
@@ -31,11 +31,11 @@
  */
 package com.jme3.bullet.collision.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java
index 81454ea95..23a90d92c 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/CollisionShape.java
@@ -31,12 +31,8 @@
  */
 package com.jme3.bullet.collision.shapes;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
+import com.jme3.export.*;
 import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
index f09d35ef7..ee4d86d25 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
@@ -32,12 +32,12 @@
 package com.jme3.bullet.collision.shapes;
 
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
index edb22da3d..fa651df4d 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
@@ -31,11 +31,11 @@
  */
 package com.jme3.bullet.collision.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
index 912268eeb..49478b402 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
@@ -31,18 +31,17 @@
  */
 package com.jme3.bullet.collision.shapes;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.scene.Mesh;
 import com.jme3.bullet.util.NativeMeshUtil;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
index 81c5039dc..5bef2e303 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/HeightfieldCollisionShape.java
@@ -14,7 +14,6 @@ import com.jme3.scene.Mesh;
 import com.jme3.util.BufferUtils;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
index 44f4b03b6..9be760f93 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
@@ -1,6 +1,5 @@
 package com.jme3.bullet.collision.shapes;
 
-import java.nio.FloatBuffer;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
@@ -10,7 +9,7 @@ import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/bullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java b/engine/src/bullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
index cee7c99e3..c13bbd1c0 100644
--- a/engine/src/bullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
+++ b/engine/src/bullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
@@ -32,11 +32,11 @@
 package com.jme3.bullet.collision.shapes;
 
 import com.jme3.bullet.util.NativeMeshUtil;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.scene.Mesh;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
+import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/ConeJoint.java b/engine/src/bullet/com/jme3/bullet/joints/ConeJoint.java
index cddcbac53..fc803ff38 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/ConeJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/ConeJoint.java
@@ -31,13 +31,13 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/HingeJoint.java b/engine/src/bullet/com/jme3/bullet/joints/HingeJoint.java
index b8ac7d3b2..93769d9c5 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/HingeJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/HingeJoint.java
@@ -31,12 +31,12 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/PhysicsJoint.java b/engine/src/bullet/com/jme3/bullet/joints/PhysicsJoint.java
index 53164ef76..ecf517c6a 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/PhysicsJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/PhysicsJoint.java
@@ -31,13 +31,9 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/Point2PointJoint.java b/engine/src/bullet/com/jme3/bullet/joints/Point2PointJoint.java
index c19039005..15f6e3ade 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/Point2PointJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/Point2PointJoint.java
@@ -31,12 +31,12 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/SixDofJoint.java b/engine/src/bullet/com/jme3/bullet/joints/SixDofJoint.java
index 05d75df7a..276032267 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/SixDofJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/SixDofJoint.java
@@ -31,15 +31,15 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.joints.motors.RotationalLimitMotor;
 import com.jme3.bullet.joints.motors.TranslationalLimitMotor;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/engine/src/bullet/com/jme3/bullet/joints/SixDofSpringJoint.java b/engine/src/bullet/com/jme3/bullet/joints/SixDofSpringJoint.java
index 1fa312fa1..df77f4990 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/SixDofSpringJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/SixDofSpringJoint.java
@@ -31,20 +31,9 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
+import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
-import com.jme3.bullet.joints.motors.RotationalLimitMotor;
-import com.jme3.bullet.joints.motors.TranslationalLimitMotor;
-import com.jme3.bullet.objects.PhysicsRigidBody;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * <i>From bullet manual:</i><br>
diff --git a/engine/src/bullet/com/jme3/bullet/joints/SliderJoint.java b/engine/src/bullet/com/jme3/bullet/joints/SliderJoint.java
index cc13a1329..400cd2887 100644
--- a/engine/src/bullet/com/jme3/bullet/joints/SliderJoint.java
+++ b/engine/src/bullet/com/jme3/bullet/joints/SliderJoint.java
@@ -31,13 +31,13 @@
  */
 package com.jme3.bullet.joints;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/objects/PhysicsCharacter.java b/engine/src/bullet/com/jme3/bullet/objects/PhysicsCharacter.java
index 430ed9944..fb98fec6d 100644
--- a/engine/src/bullet/com/jme3/bullet/objects/PhysicsCharacter.java
+++ b/engine/src/bullet/com/jme3/bullet/objects/PhysicsCharacter.java
@@ -32,13 +32,13 @@
 package com.jme3.bullet.objects;
 
 import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/bullet/com/jme3/bullet/objects/PhysicsGhostObject.java b/engine/src/bullet/com/jme3/bullet/objects/PhysicsGhostObject.java
index d644f7063..2f8716412 100644
--- a/engine/src/bullet/com/jme3/bullet/objects/PhysicsGhostObject.java
+++ b/engine/src/bullet/com/jme3/bullet/objects/PhysicsGhostObject.java
@@ -31,16 +31,16 @@
  */
 package com.jme3.bullet.objects;
 
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Quaternion;
-import com.jme3.scene.Spatial;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Spatial;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/engine/src/bullet/com/jme3/bullet/objects/PhysicsRigidBody.java b/engine/src/bullet/com/jme3/bullet/objects/PhysicsRigidBody.java
index 6a1841cd6..0d4179816 100644
--- a/engine/src/bullet/com/jme3/bullet/objects/PhysicsRigidBody.java
+++ b/engine/src/bullet/com/jme3/bullet/objects/PhysicsRigidBody.java
@@ -31,8 +31,6 @@
  */
 package com.jme3.bullet.objects;
 
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.shapes.CollisionShape;
@@ -45,8 +43,10 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.Arrow;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/engine/src/bullet/com/jme3/bullet/objects/PhysicsVehicle.java b/engine/src/bullet/com/jme3/bullet/objects/PhysicsVehicle.java
index 1f0176364..fba1e8316 100644
--- a/engine/src/bullet/com/jme3/bullet/objects/PhysicsVehicle.java
+++ b/engine/src/bullet/com/jme3/bullet/objects/PhysicsVehicle.java
@@ -31,17 +31,17 @@
  */
 package com.jme3.bullet.objects;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.objects.infos.VehicleTuning;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.Arrow;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/engine/src/bullet/com/jme3/bullet/objects/VehicleWheel.java b/engine/src/bullet/com/jme3/bullet/objects/VehicleWheel.java
index 0eabbc3cd..0da527e45 100644
--- a/engine/src/bullet/com/jme3/bullet/objects/VehicleWheel.java
+++ b/engine/src/bullet/com/jme3/bullet/objects/VehicleWheel.java
@@ -31,19 +31,13 @@
  */
 package com.jme3.bullet.objects;
 
+import com.jme3.bullet.collision.PhysicsCollisionObject;
+import com.jme3.export.*;
+import com.jme3.math.Matrix3f;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
-import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.math.Matrix3f;
 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Stores info about one wheel of a PhysicsVehicle
diff --git a/engine/src/core-plugins/com/jme3/asset/plugins/ClasspathLocator.java b/engine/src/core-plugins/com/jme3/asset/plugins/ClasspathLocator.java
index d4c84e479..f3570ded1 100644
--- a/engine/src/core-plugins/com/jme3/asset/plugins/ClasspathLocator.java
+++ b/engine/src/core-plugins/com/jme3/asset/plugins/ClasspathLocator.java
@@ -32,12 +32,7 @@
 
 package com.jme3.asset.plugins;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoadException;
-import com.jme3.asset.AssetLocator;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
+import com.jme3.asset.*;
 import com.jme3.system.JmeSystem;
 import java.io.File;
 import java.io.IOException;
diff --git a/engine/src/core-plugins/com/jme3/asset/plugins/FileLocator.java b/engine/src/core-plugins/com/jme3/asset/plugins/FileLocator.java
index be5aa1fb4..f448fa361 100644
--- a/engine/src/core-plugins/com/jme3/asset/plugins/FileLocator.java
+++ b/engine/src/core-plugins/com/jme3/asset/plugins/FileLocator.java
@@ -32,17 +32,8 @@
 
 package com.jme3.asset.plugins;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoadException;
-import com.jme3.asset.AssetLocator;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import com.jme3.asset.*;
+import java.io.*;
 
 /**
  * <code>FileLocator</code> allows you to specify a folder where to
diff --git a/engine/src/core-plugins/com/jme3/asset/plugins/UrlAssetInfo.java b/engine/src/core-plugins/com/jme3/asset/plugins/UrlAssetInfo.java
index a9494a27f..941764fdd 100644
--- a/engine/src/core-plugins/com/jme3/asset/plugins/UrlAssetInfo.java
+++ b/engine/src/core-plugins/com/jme3/asset/plugins/UrlAssetInfo.java
@@ -4,7 +4,6 @@ import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.AssetLoadException;
 import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
diff --git a/engine/src/core-plugins/com/jme3/asset/plugins/UrlLocator.java b/engine/src/core-plugins/com/jme3/asset/plugins/UrlLocator.java
index 9c7ac5701..e770930a0 100644
--- a/engine/src/core-plugins/com/jme3/asset/plugins/UrlLocator.java
+++ b/engine/src/core-plugins/com/jme3/asset/plugins/UrlLocator.java
@@ -32,7 +32,10 @@
 
 package com.jme3.asset.plugins;
 
-import com.jme3.asset.*;
+import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetKey;
+import com.jme3.asset.AssetLocator;
+import com.jme3.asset.AssetManager;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/engine/src/core-plugins/com/jme3/asset/plugins/ZipLocator.java b/engine/src/core-plugins/com/jme3/asset/plugins/ZipLocator.java
index 499ca9371..ddfdfe864 100644
--- a/engine/src/core-plugins/com/jme3/asset/plugins/ZipLocator.java
+++ b/engine/src/core-plugins/com/jme3/asset/plugins/ZipLocator.java
@@ -32,11 +32,7 @@
 
 package com.jme3.asset.plugins;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoadException;
-import com.jme3.asset.AssetLocator;
-import com.jme3.asset.AssetManager;
+import com.jme3.asset.*;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/engine/src/core-plugins/com/jme3/audio/plugins/WAVLoader.java b/engine/src/core-plugins/com/jme3/audio/plugins/WAVLoader.java
index 5b7d76dc8..ab6a19b61 100644
--- a/engine/src/core-plugins/com/jme3/audio/plugins/WAVLoader.java
+++ b/engine/src/core-plugins/com/jme3/audio/plugins/WAVLoader.java
@@ -32,12 +32,12 @@
 
 package com.jme3.audio.plugins;
 
-import com.jme3.audio.AudioBuffer;
-import com.jme3.audio.AudioData;
-import com.jme3.audio.AudioStream;
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetLoader;
+import com.jme3.audio.AudioBuffer;
+import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioKey;
+import com.jme3.audio.AudioStream;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.LittleEndien;
 import java.io.IOException;
diff --git a/engine/src/core-plugins/com/jme3/export/binary/BinaryExporter.java b/engine/src/core-plugins/com/jme3/export/binary/BinaryExporter.java
index c5ce66eb5..b9ec78d5e 100644
--- a/engine/src/core-plugins/com/jme3/export/binary/BinaryExporter.java
+++ b/engine/src/core-plugins/com/jme3/export/binary/BinaryExporter.java
@@ -32,16 +32,12 @@
 
 package com.jme3.export.binary;
 
+import com.jme3.export.FormatVersion;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.Savable;
-import com.jme3.export.FormatVersion;
 import com.jme3.export.SavableClassUtil;
 import com.jme3.math.FastMath;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
diff --git a/engine/src/core-plugins/com/jme3/export/binary/BinaryImporter.java b/engine/src/core-plugins/com/jme3/export/binary/BinaryImporter.java
index afc131543..2e4501107 100644
--- a/engine/src/core-plugins/com/jme3/export/binary/BinaryImporter.java
+++ b/engine/src/core-plugins/com/jme3/export/binary/BinaryImporter.java
@@ -32,22 +32,11 @@
 
 package com.jme3.export.binary;
 
-import com.jme3.export.SavableClassUtil;
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetManager;
-import com.jme3.export.FormatVersion;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.ReadListener;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.FastMath;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.nio.ByteOrder;
 import java.util.HashMap;
diff --git a/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java b/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java
index 4575b76a8..688627dd8 100644
--- a/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java
+++ b/engine/src/core-plugins/com/jme3/font/plugins/BitmapFontLoader.java
@@ -32,16 +32,13 @@
 
 package com.jme3.font.plugins;
 
-import com.jme3.font.*;
+import com.jme3.asset.*;
+import com.jme3.font.BitmapCharacter;
+import com.jme3.font.BitmapCharacterSet;
+import com.jme3.font.BitmapFont;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialDef;
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.TextureKey;
 import com.jme3.material.RenderState.BlendMode;
-import com.jme3.math.ColorRGBA;
 import com.jme3.texture.Texture;
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java b/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java
index 702e4e761..e07d3e4da 100644
--- a/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java
+++ b/engine/src/core-plugins/com/jme3/material/plugins/J3MLoader.java
@@ -32,32 +32,25 @@
 
 package com.jme3.material.plugins;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoadException;
-import com.jme3.material.*;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import com.jme3.asset.MaterialKey;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.material.RenderState.FaceCullMode;
+import com.jme3.material.*;
 import com.jme3.material.TechniqueDef.LightMode;
 import com.jme3.material.TechniqueDef.ShadowMode;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
 import com.jme3.shader.VarType;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
 import com.jme3.util.PlaceholderAssets;
+import com.jme3.util.blockparser.BlockLanguageParser;
+import com.jme3.util.blockparser.Statement;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import com.jme3.util.blockparser.BlockLanguageParser;
-import com.jme3.util.blockparser.Statement;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core-plugins/com/jme3/scene/plugins/MTLLoader.java b/engine/src/core-plugins/com/jme3/scene/plugins/MTLLoader.java
index bebb72411..1f701cd4c 100644
--- a/engine/src/core-plugins/com/jme3/scene/plugins/MTLLoader.java
+++ b/engine/src/core-plugins/com/jme3/scene/plugins/MTLLoader.java
@@ -32,12 +32,7 @@
 
 package com.jme3.scene.plugins;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialList;
 import com.jme3.material.RenderState.BlendMode;
diff --git a/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java b/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java
index 8854ec1d9..082d30411 100644
--- a/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java
+++ b/engine/src/core-plugins/com/jme3/scene/plugins/OBJLoader.java
@@ -35,32 +35,25 @@ package com.jme3.scene.plugins;
 import com.jme3.asset.*;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialList;
-import com.jme3.util.*;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.scene.mesh.IndexIntBuffer;
 import com.jme3.scene.mesh.IndexShortBuffer;
+import com.jme3.util.BufferUtils;
+import com.jme3.util.IntMap;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Scanner;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core-plugins/com/jme3/shader/plugins/GLSLLoader.java b/engine/src/core-plugins/com/jme3/shader/plugins/GLSLLoader.java
index 12f7a0069..f9073b723 100644
--- a/engine/src/core-plugins/com/jme3/shader/plugins/GLSLLoader.java
+++ b/engine/src/core-plugins/com/jme3/shader/plugins/GLSLLoader.java
@@ -40,14 +40,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * GLSL File parser that supports #import pre-processor statement
diff --git a/engine/src/core-plugins/com/jme3/texture/plugins/DDSLoader.java b/engine/src/core-plugins/com/jme3/texture/plugins/DDSLoader.java
index 8e21ee569..897c9eb1f 100644
--- a/engine/src/core-plugins/com/jme3/texture/plugins/DDSLoader.java
+++ b/engine/src/core-plugins/com/jme3/texture/plugins/DDSLoader.java
@@ -43,7 +43,6 @@ import java.io.DataInput;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
-
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/core-plugins/com/jme3/texture/plugins/HDRLoader.java b/engine/src/core-plugins/com/jme3/texture/plugins/HDRLoader.java
index 2e0a7c5f2..c66c5e503 100644
--- a/engine/src/core-plugins/com/jme3/texture/plugins/HDRLoader.java
+++ b/engine/src/core-plugins/com/jme3/texture/plugins/HDRLoader.java
@@ -32,11 +32,13 @@
 
 package com.jme3.texture.plugins;
 
-import com.jme3.asset.*;
-import com.jme3.util.*;
+import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetLoader;
+import com.jme3.asset.TextureKey;
 import com.jme3.math.FastMath;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
+import com.jme3.util.BufferUtils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java b/engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java
index 37666f69a..bbd51d641 100644
--- a/engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java
+++ b/engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java
@@ -32,13 +32,13 @@
 
 package com.jme3.texture.plugins;
 
-import com.jme3.math.FastMath;
-import com.jme3.asset.AssetLoader;
-import com.jme3.texture.Image;
-import com.jme3.util.BufferUtils;
 import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetLoader;
 import com.jme3.asset.TextureKey;
+import com.jme3.math.FastMath;
+import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
+import com.jme3.util.BufferUtils;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/engine/src/core/checkers/quals/DefaultQualifier.java b/engine/src/core/checkers/quals/DefaultQualifier.java
index c6fa2c25e..5caf5dabb 100644
--- a/engine/src/core/checkers/quals/DefaultQualifier.java
+++ b/engine/src/core/checkers/quals/DefaultQualifier.java
@@ -1,7 +1,9 @@
 package checkers.quals;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
diff --git a/engine/src/core/checkers/quals/DefaultQualifierInHierarchy.java b/engine/src/core/checkers/quals/DefaultQualifierInHierarchy.java
index 619a751d8..949846dd6 100644
--- a/engine/src/core/checkers/quals/DefaultQualifierInHierarchy.java
+++ b/engine/src/core/checkers/quals/DefaultQualifierInHierarchy.java
@@ -1,8 +1,10 @@
 package checkers.quals;
 
+import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-
-import java.lang.annotation.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Indicates that the annotated qualifier is the default qualifier in the
diff --git a/engine/src/core/checkers/quals/DefaultQualifiers.java b/engine/src/core/checkers/quals/DefaultQualifiers.java
index bf3349e23..e483e63e7 100644
--- a/engine/src/core/checkers/quals/DefaultQualifiers.java
+++ b/engine/src/core/checkers/quals/DefaultQualifiers.java
@@ -1,8 +1,10 @@
 package checkers.quals;
 
+import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.*;
-
-import java.lang.annotation.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Specifies the annotations to be included in a type without having to provide
diff --git a/engine/src/core/checkers/quals/Dependent.java b/engine/src/core/checkers/quals/Dependent.java
index 8c96cf66d..88d3b39d1 100644
--- a/engine/src/core/checkers/quals/Dependent.java
+++ b/engine/src/core/checkers/quals/Dependent.java
@@ -1,6 +1,9 @@
 package checkers.quals;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Refines the qualified type of the annotated field or variable based on the
diff --git a/engine/src/core/checkers/quals/Unused.java b/engine/src/core/checkers/quals/Unused.java
index 98d99fa68..726df8bbd 100644
--- a/engine/src/core/checkers/quals/Unused.java
+++ b/engine/src/core/checkers/quals/Unused.java
@@ -1,7 +1,6 @@
 package checkers.quals;
 
-import static java.lang.annotation.ElementType.*;
-
+import static java.lang.annotation.ElementType.FIELD;
 import java.lang.annotation.*;
 
 /**
diff --git a/engine/src/core/com/jme3/animation/AnimControl.java b/engine/src/core/com/jme3/animation/AnimControl.java
index 718866345..3bddd60ee 100644
--- a/engine/src/core/com/jme3/animation/AnimControl.java
+++ b/engine/src/core/com/jme3/animation/AnimControl.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.animation;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Mesh;
diff --git a/engine/src/core/com/jme3/animation/Animation.java b/engine/src/core/com/jme3/animation/Animation.java
index ef1af1299..0fb505a2f 100644
--- a/engine/src/core/com/jme3/animation/Animation.java
+++ b/engine/src/core/com/jme3/animation/Animation.java
@@ -31,14 +31,9 @@
  */
 package com.jme3.animation;
 
-import java.io.IOException;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.TempVars;
+import java.io.IOException;
 
 /**
  * The animation class updates the animation target with the tracks of a given type.
diff --git a/engine/src/core/com/jme3/animation/Bone.java b/engine/src/core/com/jme3/animation/Bone.java
index d3e717bbe..135d7a5a8 100644
--- a/engine/src/core/com/jme3/animation/Bone.java
+++ b/engine/src/core/com/jme3/animation/Bone.java
@@ -31,16 +31,8 @@
  */
 package com.jme3.animation;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Transform;
-import com.jme3.math.Vector3f;
+import com.jme3.export.*;
+import com.jme3.math.*;
 import com.jme3.scene.Node;
 import com.jme3.util.TempVars;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/animation/BoneTrack.java b/engine/src/core/com/jme3/animation/BoneTrack.java
index aa73106ae..b317dca80 100644
--- a/engine/src/core/com/jme3/animation/BoneTrack.java
+++ b/engine/src/core/com/jme3/animation/BoneTrack.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.animation;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.util.TempVars;
diff --git a/engine/src/core/com/jme3/animation/CompactQuaternionArray.java b/engine/src/core/com/jme3/animation/CompactQuaternionArray.java
index 8dc24ad07..7c56c413c 100644
--- a/engine/src/core/com/jme3/animation/CompactQuaternionArray.java
+++ b/engine/src/core/com/jme3/animation/CompactQuaternionArray.java
@@ -31,14 +31,9 @@
  */
 package com.jme3.animation;
 
-import java.io.IOException;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Quaternion;
+import java.io.IOException;
 
 /**
  * Serialize and compress {@link Quaternion}[] by indexing same values
diff --git a/engine/src/core/com/jme3/animation/CompactVector3Array.java b/engine/src/core/com/jme3/animation/CompactVector3Array.java
index c6edf3de9..cdfc6e44d 100644
--- a/engine/src/core/com/jme3/animation/CompactVector3Array.java
+++ b/engine/src/core/com/jme3/animation/CompactVector3Array.java
@@ -32,14 +32,9 @@
 
 package com.jme3.animation;
 
-import java.io.IOException;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Vector3f;
+import java.io.IOException;
 
 /**
  * Serialize and compress Vector3f[] by indexing same values
diff --git a/engine/src/core/com/jme3/animation/Pose.java b/engine/src/core/com/jme3/animation/Pose.java
index d1b447c93..9ff6ec8b1 100644
--- a/engine/src/core/com/jme3/animation/Pose.java
+++ b/engine/src/core/com/jme3/animation/Pose.java
@@ -32,16 +32,11 @@
 
 package com.jme3.animation;
 
-import java.io.IOException;
-import java.nio.FloatBuffer;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Vector3f;
 import com.jme3.util.BufferUtils;
+import java.io.IOException;
+import java.nio.FloatBuffer;
 
 /**
  * A pose is a list of offsets that say where a mesh vertices should be for this pose.
diff --git a/engine/src/core/com/jme3/animation/PoseTrack.java b/engine/src/core/com/jme3/animation/PoseTrack.java
index 83785746e..bf1b0ab78 100644
--- a/engine/src/core/com/jme3/animation/PoseTrack.java
+++ b/engine/src/core/com/jme3/animation/PoseTrack.java
@@ -32,11 +32,7 @@
 
 package com.jme3.animation;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Type;
diff --git a/engine/src/core/com/jme3/animation/Skeleton.java b/engine/src/core/com/jme3/animation/Skeleton.java
index 59e78edcb..bc365421a 100644
--- a/engine/src/core/com/jme3/animation/Skeleton.java
+++ b/engine/src/core/com/jme3/animation/Skeleton.java
@@ -31,15 +31,10 @@
  */
 package com.jme3.animation;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Matrix4f;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/engine/src/core/com/jme3/animation/SkeletonControl.java b/engine/src/core/com/jme3/animation/SkeletonControl.java
index 59f70fbff..3c8e117c0 100644
--- a/engine/src/core/com/jme3/animation/SkeletonControl.java
+++ b/engine/src/core/com/jme3/animation/SkeletonControl.java
@@ -4,21 +4,12 @@
  */
 package com.jme3.animation;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Matrix4f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.UserData;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.control.AbstractControl;
 import com.jme3.scene.control.Control;
diff --git a/engine/src/core/com/jme3/animation/SpatialTrack.java b/engine/src/core/com/jme3/animation/SpatialTrack.java
index ff29000f5..8c4c523e4 100644
--- a/engine/src/core/com/jme3/animation/SpatialTrack.java
+++ b/engine/src/core/com/jme3/animation/SpatialTrack.java
@@ -1,7 +1,5 @@
 package com.jme3.animation;
 
-import java.io.IOException;
-
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
@@ -10,6 +8,7 @@ import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
 import com.jme3.util.TempVars;
+import java.io.IOException;
 import java.util.Arrays;
 
 /**
diff --git a/engine/src/core/com/jme3/app/AppTask.java b/engine/src/core/com/jme3/app/AppTask.java
index d17dc7c9b..1b1b68c76 100644
--- a/engine/src/core/com/jme3/app/AppTask.java
+++ b/engine/src/core/com/jme3/app/AppTask.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.app;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
diff --git a/engine/src/core/com/jme3/app/Application.java b/engine/src/core/com/jme3/app/Application.java
index 578ce6a4d..8dc2c832b 100644
--- a/engine/src/core/com/jme3/app/Application.java
+++ b/engine/src/core/com/jme3/app/Application.java
@@ -33,22 +33,18 @@
 package com.jme3.app;
 
 import com.jme3.app.state.AppStateManager;
-import com.jme3.input.JoyInput;
-import com.jme3.input.KeyInput;
-import com.jme3.input.MouseInput;
-import com.jme3.input.TouchInput;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.Camera;
-import com.jme3.renderer.Renderer;
 import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioContext;
 import com.jme3.audio.AudioRenderer;
 import com.jme3.audio.Listener;
-import com.jme3.input.InputManager;
+import com.jme3.input.*;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeContext;
+import com.jme3.system.JmeContext.Type;
+import com.jme3.system.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.concurrent.Callable;
@@ -56,11 +52,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import com.jme3.system.JmeContext.Type;
-import com.jme3.system.JmeSystem;
-import com.jme3.system.NanoTimer;
-import com.jme3.system.SystemListener;
-import com.jme3.system.Timer;
 
 /**
  * The <code>Application</code> class represents an instance of a
diff --git a/engine/src/core/com/jme3/asset/AssetKey.java b/engine/src/core/com/jme3/asset/AssetKey.java
index 955128682..9b6f0cd68 100644
--- a/engine/src/core/com/jme3/asset/AssetKey.java
+++ b/engine/src/core/com/jme3/asset/AssetKey.java
@@ -32,11 +32,7 @@
 
 package com.jme3.asset;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.LinkedList;
 
diff --git a/engine/src/core/com/jme3/asset/AssetManager.java b/engine/src/core/com/jme3/asset/AssetManager.java
index e9bb120e9..a863ebf09 100644
--- a/engine/src/core/com/jme3/asset/AssetManager.java
+++ b/engine/src/core/com/jme3/asset/AssetManager.java
@@ -32,8 +32,8 @@
 
 package com.jme3.asset;
 
-import com.jme3.audio.AudioKey;
 import com.jme3.audio.AudioData;
+import com.jme3.audio.AudioKey;
 import com.jme3.font.BitmapFont;
 import com.jme3.material.Material;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/asset/DesktopAssetManager.java b/engine/src/core/com/jme3/asset/DesktopAssetManager.java
index e1c25abd6..e2d8ef847 100644
--- a/engine/src/core/com/jme3/asset/DesktopAssetManager.java
+++ b/engine/src/core/com/jme3/asset/DesktopAssetManager.java
@@ -33,8 +33,8 @@
 package com.jme3.asset;
 
 import com.jme3.asset.AssetCache.SmartAssetInfo;
-import com.jme3.audio.AudioKey;
 import com.jme3.audio.AudioData;
+import com.jme3.audio.AudioKey;
 import com.jme3.font.BitmapFont;
 import com.jme3.material.Material;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/asset/TextureKey.java b/engine/src/core/com/jme3/asset/TextureKey.java
index 31f67582d..118c84ef4 100644
--- a/engine/src/core/com/jme3/asset/TextureKey.java
+++ b/engine/src/core/com/jme3/asset/TextureKey.java
@@ -31,16 +31,12 @@
  */
 package com.jme3.asset;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
-import com.jme3.texture.Image;
-import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.Type;
-import com.jme3.texture.Texture2D;
-import com.jme3.texture.Texture3D;
-import com.jme3.texture.TextureCubeMap;
+import com.jme3.texture.*;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
diff --git a/engine/src/core/com/jme3/audio/AudioKey.java b/engine/src/core/com/jme3/audio/AudioKey.java
index 73a435b0f..e9492bb9b 100644
--- a/engine/src/core/com/jme3/audio/AudioKey.java
+++ b/engine/src/core/com/jme3/audio/AudioKey.java
@@ -33,9 +33,9 @@
 package com.jme3.audio;
 
 import com.jme3.asset.AssetKey;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/audio/LowPassFilter.java b/engine/src/core/com/jme3/audio/LowPassFilter.java
index 64f7a9283..58242cf3c 100644
--- a/engine/src/core/com/jme3/audio/LowPassFilter.java
+++ b/engine/src/core/com/jme3/audio/LowPassFilter.java
@@ -32,9 +32,9 @@
 
 package com.jme3.audio;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.util.NativeObject;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/bounding/BoundingBox.java b/engine/src/core/com/jme3/bounding/BoundingBox.java
index e8f223386..9dde01533 100644
--- a/engine/src/core/com/jme3/bounding/BoundingBox.java
+++ b/engine/src/core/com/jme3/bounding/BoundingBox.java
@@ -39,20 +39,12 @@ import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
-import java.io.IOException;
-import java.nio.FloatBuffer;
-
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Plane;
-import com.jme3.math.Ray;
-import com.jme3.math.Transform;
-import com.jme3.math.Triangle;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.scene.Mesh;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
+import java.io.IOException;
+import java.nio.FloatBuffer;
 //import com.jme.scene.TriMesh;
 
 /**
diff --git a/engine/src/core/com/jme3/bounding/BoundingSphere.java b/engine/src/core/com/jme3/bounding/BoundingSphere.java
index 1eaef3581..5bb9a5d1e 100644
--- a/engine/src/core/com/jme3/bounding/BoundingSphere.java
+++ b/engine/src/core/com/jme3/bounding/BoundingSphere.java
@@ -37,21 +37,14 @@ import com.jme3.collision.CollisionResults;
 import com.jme3.collision.UnsupportedCollisionException;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.math.*;
+import com.jme3.util.BufferUtils;
+import com.jme3.util.TempVars;
 import java.io.IOException;
 import java.nio.FloatBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Plane;
-import com.jme3.math.Ray;
-import com.jme3.math.Transform;
-import com.jme3.math.Triangle;
-import com.jme3.math.Vector3f;
-import com.jme3.util.BufferUtils;
-import com.jme3.util.TempVars;
-
 /**
  * <code>BoundingSphere</code> defines a sphere that defines a container for a
  * group of vertices of a particular piece of geometry. This sphere defines a
diff --git a/engine/src/core/com/jme3/bounding/BoundingVolume.java b/engine/src/core/com/jme3/bounding/BoundingVolume.java
index c96fdfb86..9e8dadae4 100644
--- a/engine/src/core/com/jme3/bounding/BoundingVolume.java
+++ b/engine/src/core/com/jme3/bounding/BoundingVolume.java
@@ -36,15 +36,10 @@ import com.jme3.collision.Collidable;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.Savable;
-import com.jme3.math.Matrix4f;
+import com.jme3.math.*;
 import java.io.IOException;
 import java.nio.FloatBuffer;
 
-import com.jme3.math.Plane;
-import com.jme3.math.Ray;
-import com.jme3.math.Transform;
-import com.jme3.math.Vector3f;
-
 /**
  * <code>BoundingVolume</code> defines an interface for dealing with
  * containment of a collection of points.
diff --git a/engine/src/core/com/jme3/bounding/Intersection.java b/engine/src/core/com/jme3/bounding/Intersection.java
index c4e641ddc..c53b79247 100644
--- a/engine/src/core/com/jme3/bounding/Intersection.java
+++ b/engine/src/core/com/jme3/bounding/Intersection.java
@@ -31,13 +31,12 @@
  */
 package com.jme3.bounding;
 
-import com.jme3.util.TempVars;
 import com.jme3.math.FastMath;
 import com.jme3.math.Plane;
 import com.jme3.math.Vector3f;
-
-import static java.lang.Math.min;
+import com.jme3.util.TempVars;
 import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 /**
  * This class includes some utility methods for computing intersection
diff --git a/engine/src/core/com/jme3/cinematic/Cinematic.java b/engine/src/core/com/jme3/cinematic/Cinematic.java
index e006d5887..ed05b9b2e 100644
--- a/engine/src/core/com/jme3/cinematic/Cinematic.java
+++ b/engine/src/core/com/jme3/cinematic/Cinematic.java
@@ -31,24 +31,18 @@
  */
 package com.jme3.cinematic;
 
-import com.jme3.cinematic.events.AbstractCinematicEvent;
-import com.jme3.cinematic.events.CinematicEvent;
 import com.jme3.animation.LoopMode;
 import com.jme3.app.Application;
 import com.jme3.app.state.AppState;
 import com.jme3.app.state.AppStateManager;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-//import com.jme3.niftygui.NiftyJmeDisplay;
+import com.jme3.cinematic.events.AbstractCinematicEvent;
+import com.jme3.cinematic.events.CinematicEvent;
+import com.jme3.export.*;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.scene.CameraNode;
 import com.jme3.scene.Node;
 import com.jme3.scene.control.CameraControl.ControlDirection;
-//import de.lessvoid.nifty.Nifty;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/engine/src/core/com/jme3/cinematic/KeyFrame.java b/engine/src/core/com/jme3/cinematic/KeyFrame.java
index 1651cdefd..2a4b200e2 100644
--- a/engine/src/core/com/jme3/cinematic/KeyFrame.java
+++ b/engine/src/core/com/jme3/cinematic/KeyFrame.java
@@ -32,11 +32,7 @@
 package com.jme3.cinematic;
 
 import com.jme3.cinematic.events.CinematicEvent;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/engine/src/core/com/jme3/cinematic/MotionPath.java b/engine/src/core/com/jme3/cinematic/MotionPath.java
index 4aa0ee915..7c2584c16 100644
--- a/engine/src/core/com/jme3/cinematic/MotionPath.java
+++ b/engine/src/core/com/jme3/cinematic/MotionPath.java
@@ -31,24 +31,17 @@
  */
 package com.jme3.cinematic;
 
-import com.jme3.cinematic.events.MotionTrack;
 import com.jme3.asset.AssetManager;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.cinematic.events.MotionTrack;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
 import com.jme3.math.Spline;
+import com.jme3.math.Spline.SplineType;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
-import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.shape.Box;
-import com.jme3.math.Spline.SplineType;
 import com.jme3.scene.shape.Curve;
 import com.jme3.util.TempVars;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/cinematic/TimeLine.java b/engine/src/core/com/jme3/cinematic/TimeLine.java
index d0b5ede71..70e1522e2 100644
--- a/engine/src/core/com/jme3/cinematic/TimeLine.java
+++ b/engine/src/core/com/jme3/cinematic/TimeLine.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.cinematic;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/engine/src/core/com/jme3/cinematic/events/SoundTrack.java b/engine/src/core/com/jme3/cinematic/events/SoundTrack.java
index c0b5ace59..b2761b84f 100644
--- a/engine/src/core/com/jme3/cinematic/events/SoundTrack.java
+++ b/engine/src/core/com/jme3/cinematic/events/SoundTrack.java
@@ -34,7 +34,6 @@ package com.jme3.cinematic.events;
 import com.jme3.animation.LoopMode;
 import com.jme3.app.Application;
 import com.jme3.audio.AudioNode;
-import com.jme3.audio.AudioRenderer;
 import com.jme3.cinematic.Cinematic;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
diff --git a/engine/src/core/com/jme3/collision/SweepSphere.java b/engine/src/core/com/jme3/collision/SweepSphere.java
index 6a3723671..9d43f8909 100644
--- a/engine/src/core/com/jme3/collision/SweepSphere.java
+++ b/engine/src/core/com/jme3/collision/SweepSphere.java
@@ -32,11 +32,7 @@
 
 package com.jme3.collision;
 
-import com.jme3.math.AbstractTriangle;
-import com.jme3.math.FastMath;
-import com.jme3.math.Plane;
-import com.jme3.math.Triangle;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 
 /**
  * No longer public ..
diff --git a/engine/src/core/com/jme3/collision/bih/BIHNode.java b/engine/src/core/com/jme3/collision/bih/BIHNode.java
index ba067d005..0f5c1c820 100644
--- a/engine/src/core/com/jme3/collision/bih/BIHNode.java
+++ b/engine/src/core/com/jme3/collision/bih/BIHNode.java
@@ -35,21 +35,16 @@ import com.jme3.bounding.BoundingBox;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResult;
 import com.jme3.collision.CollisionResults;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Ray;
 import com.jme3.math.Triangle;
 import com.jme3.math.Vector3f;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.util.ArrayList;
-
-import static java.lang.Math.min;
 import static java.lang.Math.max;
+import static java.lang.Math.min;
+import java.util.ArrayList;
 
 /**
  * Bounding Interval Hierarchy.
diff --git a/engine/src/core/com/jme3/collision/bih/BIHTree.java b/engine/src/core/com/jme3/collision/bih/BIHTree.java
index 223bb5cbf..cbc59611a 100644
--- a/engine/src/core/com/jme3/collision/bih/BIHTree.java
+++ b/engine/src/core/com/jme3/collision/bih/BIHTree.java
@@ -31,18 +31,15 @@
  */
 package com.jme3.collision.bih;
 
-import com.jme3.scene.mesh.VirtualIndexBuffer;
-import com.jme3.scene.mesh.WrappedIndexBuffer;
-import com.jme3.bounding.BoundingSphere;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.bounding.BoundingBox;
+import com.jme3.bounding.BoundingSphere;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
 import com.jme3.collision.UnsupportedCollisionException;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Matrix4f;
@@ -50,14 +47,15 @@ import com.jme3.math.Ray;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.CollisionData;
 import com.jme3.scene.Mesh;
-
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.mesh.IndexBuffer;
+import com.jme3.scene.mesh.VirtualIndexBuffer;
+import com.jme3.scene.mesh.WrappedIndexBuffer;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.nio.FloatBuffer;
-
 import static java.lang.Math.max;
+import java.nio.FloatBuffer;
 
 public class BIHTree implements CollisionData {
 
diff --git a/engine/src/core/com/jme3/effect/ParticleEmitter.java b/engine/src/core/com/jme3/effect/ParticleEmitter.java
index 6e20602df..ea0e14364 100644
--- a/engine/src/core/com/jme3/effect/ParticleEmitter.java
+++ b/engine/src/core/com/jme3/effect/ParticleEmitter.java
@@ -37,9 +37,9 @@ import com.jme3.effect.influencers.DefaultParticleInfluencer;
 import com.jme3.effect.influencers.ParticleInfluencer;
 import com.jme3.effect.shapes.EmitterPointShape;
 import com.jme3.effect.shapes.EmitterShape;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
diff --git a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
index ade14069c..80f52d96e 100644
--- a/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/DefaultParticleInfluencer.java
@@ -1,7 +1,5 @@
 package com.jme3.effect.influencers;
 
-import java.io.IOException;
-
 import com.jme3.effect.Particle;
 import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.InputCapsule;
@@ -10,6 +8,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
+import java.io.IOException;
 
 /**
  * This emitter influences the particles so that they move all in the same direction.
diff --git a/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
index dced19646..013a5db24 100644
--- a/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/EmptyParticleInfluencer.java
@@ -1,12 +1,11 @@
 package com.jme3.effect.influencers;
 
-import java.io.IOException;
-
 import com.jme3.effect.Particle;
 import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.math.Vector3f;
+import java.io.IOException;
 
 /**
  * This influencer does not influence particle at all.
diff --git a/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java b/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
index e5321ddee..a2701be7a 100644
--- a/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
+++ b/engine/src/core/com/jme3/effect/influencers/NewtonianParticleInfluencer.java
@@ -1,7 +1,5 @@
 package com.jme3.effect.influencers;
 
-import java.io.IOException;
-
 import com.jme3.effect.Particle;
 import com.jme3.effect.shapes.EmitterShape;
 import com.jme3.export.InputCapsule;
@@ -10,6 +8,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Matrix3f;
+import java.io.IOException;
 
 /**
  * This influencer calculates initial velocity with the use of the emitter's shape.
diff --git a/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
index cf6e89d39..9838dd2e6 100644
--- a/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterBoxShape.java
@@ -31,9 +31,9 @@
  */
 package com.jme3.effect.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
index d22d95441..1c5d687c9 100644
--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshConvexHullShape.java
@@ -1,10 +1,9 @@
 package com.jme3.effect.shapes;
 
-import java.util.List;
-
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
+import java.util.List;
 
 /**
  * This emiter shape emits the particles from the given shape's interior constrained by its convex hull
diff --git a/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
index a8eb05139..023ca5b60 100644
--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshFaceShape.java
@@ -1,13 +1,12 @@
 package com.jme3.effect.shapes;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This emiter shape emits the particles from the given shape's faces.
diff --git a/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
index 07a54b632..28ee8b4f7 100644
--- a/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterMeshVertexShape.java
@@ -1,13 +1,6 @@
 package com.jme3.effect.shapes;
 
 import com.jme3.export.InputCapsule;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
@@ -16,6 +9,12 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * This emiter shape emits the particles from the given shape's vertices
diff --git a/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java b/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
index 1ba5aa859..642b27959 100644
--- a/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
+++ b/engine/src/core/com/jme3/effect/shapes/EmitterSphereShape.java
@@ -31,9 +31,9 @@
  */
 package com.jme3.effect.shapes;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/core/com/jme3/export/SavableClassUtil.java b/engine/src/core/com/jme3/export/SavableClassUtil.java
index 804990f82..6a48ca3b8 100644
--- a/engine/src/core/com/jme3/export/SavableClassUtil.java
+++ b/engine/src/core/com/jme3/export/SavableClassUtil.java
@@ -32,21 +32,15 @@
 package com.jme3.export;
 
 import com.jme3.animation.Animation;
-import com.jme3.effect.shapes.EmitterBoxShape;
-import com.jme3.effect.shapes.EmitterMeshConvexHullShape;
-import com.jme3.effect.shapes.EmitterMeshFaceShape;
-import com.jme3.effect.shapes.EmitterMeshVertexShape;
-import com.jme3.effect.shapes.EmitterPointShape;
-import com.jme3.effect.shapes.EmitterSphereShape;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+import com.jme3.effect.shapes.*;
 import com.jme3.material.MatParamTexture;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <code>SavableClassUtil</code> contains various utilities to handle
diff --git a/engine/src/core/com/jme3/font/BitmapCharacter.java b/engine/src/core/com/jme3/font/BitmapCharacter.java
index bf635d6d7..8e06b87d9 100644
--- a/engine/src/core/com/jme3/font/BitmapCharacter.java
+++ b/engine/src/core/com/jme3/font/BitmapCharacter.java
@@ -32,11 +32,7 @@
 
 package com.jme3.font;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/font/BitmapCharacterSet.java b/engine/src/core/com/jme3/font/BitmapCharacterSet.java
index f31ce8c0e..be515546c 100644
--- a/engine/src/core/com/jme3/font/BitmapCharacterSet.java
+++ b/engine/src/core/com/jme3/font/BitmapCharacterSet.java
@@ -32,15 +32,10 @@
 
 package com.jme3.font;
 
-import java.io.IOException;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
+import java.io.IOException;
 
 public class BitmapCharacterSet implements Savable {
 
diff --git a/engine/src/core/com/jme3/font/BitmapFont.java b/engine/src/core/com/jme3/font/BitmapFont.java
index f97c10209..ce532e949 100644
--- a/engine/src/core/com/jme3/font/BitmapFont.java
+++ b/engine/src/core/com/jme3/font/BitmapFont.java
@@ -32,14 +32,9 @@
 
 package com.jme3.font;
 
-import java.io.IOException;
-
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
+import java.io.IOException;
 
 /**
  * Represents a font within jME that is generated with the AngelCode Bitmap Font Generator
diff --git a/engine/src/core/com/jme3/font/BitmapText.java b/engine/src/core/com/jme3/font/BitmapText.java
index 6a483c0e2..760132462 100644
--- a/engine/src/core/com/jme3/font/BitmapText.java
+++ b/engine/src/core/com/jme3/font/BitmapText.java
@@ -31,16 +31,14 @@
  */
 package com.jme3.font;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.jme3.font.BitmapFont.Align;
 import com.jme3.font.BitmapFont.VAlign;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Node;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author YongHoon
diff --git a/engine/src/core/com/jme3/font/BitmapTextPage.java b/engine/src/core/com/jme3/font/BitmapTextPage.java
index 5f3ce4a98..f49b5c934 100644
--- a/engine/src/core/com/jme3/font/BitmapTextPage.java
+++ b/engine/src/core/com/jme3/font/BitmapTextPage.java
@@ -31,11 +31,6 @@
  */
 package com.jme3.font;
 
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.ShortBuffer;
-import java.util.LinkedList;
-
 import com.jme3.material.Material;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
@@ -43,6 +38,10 @@ import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.texture.Texture2D;
 import com.jme3.util.BufferUtils;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
+import java.util.LinkedList;
 
 /**
  * One page per BitmapText Font Texture.
diff --git a/engine/src/core/com/jme3/font/ColorTags.java b/engine/src/core/com/jme3/font/ColorTags.java
index e1559e720..01f15c31f 100644
--- a/engine/src/core/com/jme3/font/ColorTags.java
+++ b/engine/src/core/com/jme3/font/ColorTags.java
@@ -1,11 +1,10 @@
 package com.jme3.font;
 
+import com.jme3.math.ColorRGBA;
 import java.util.LinkedList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.jme3.math.ColorRGBA;
-
 /**
  * Contains the color information tagged in a text string
  * Format: \#rgb#
diff --git a/engine/src/core/com/jme3/font/Kerning.java b/engine/src/core/com/jme3/font/Kerning.java
index 0b2bf4011..e4be81518 100644
--- a/engine/src/core/com/jme3/font/Kerning.java
+++ b/engine/src/core/com/jme3/font/Kerning.java
@@ -32,11 +32,7 @@
 
 package com.jme3.font;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 
diff --git a/engine/src/core/com/jme3/font/LetterQuad.java b/engine/src/core/com/jme3/font/LetterQuad.java
index 5643661be..09f0e2431 100644
--- a/engine/src/core/com/jme3/font/LetterQuad.java
+++ b/engine/src/core/com/jme3/font/LetterQuad.java
@@ -1,11 +1,10 @@
 package com.jme3.font;
 
+import com.jme3.math.ColorRGBA;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
 
-import com.jme3.math.ColorRGBA;
-
 /**
  * LetterQuad contains the position, color, uv texture information for a character in text.
  * @author YongHoon
diff --git a/engine/src/core/com/jme3/font/Letters.java b/engine/src/core/com/jme3/font/Letters.java
index 34cd7dc4b..dbb9ef9c2 100644
--- a/engine/src/core/com/jme3/font/Letters.java
+++ b/engine/src/core/com/jme3/font/Letters.java
@@ -1,11 +1,10 @@
 package com.jme3.font;
 
-import java.util.LinkedList;
-
 import com.jme3.font.BitmapFont.Align;
 import com.jme3.font.BitmapFont.VAlign;
 import com.jme3.font.ColorTags.Range;
 import com.jme3.math.ColorRGBA;
+import java.util.LinkedList;
 
 /**
  * Manage and align LetterQuads
diff --git a/engine/src/core/com/jme3/input/ChaseCamera.java b/engine/src/core/com/jme3/input/ChaseCamera.java
index e230e4f84..2d96e05d1 100644
--- a/engine/src/core/com/jme3/input/ChaseCamera.java
+++ b/engine/src/core/com/jme3/input/ChaseCamera.java
@@ -35,11 +35,7 @@ import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
-import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.AnalogListener;
-import com.jme3.input.controls.MouseAxisTrigger;
-import com.jme3.input.controls.MouseButtonTrigger;
-import com.jme3.input.controls.Trigger;
+import com.jme3.input.controls.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
diff --git a/engine/src/core/com/jme3/input/FlyByCamera.java b/engine/src/core/com/jme3/input/FlyByCamera.java
index e1bc2127d..e5b7f04b5 100644
--- a/engine/src/core/com/jme3/input/FlyByCamera.java
+++ b/engine/src/core/com/jme3/input/FlyByCamera.java
@@ -33,12 +33,7 @@
 package com.jme3.input;
 
 import com.jme3.collision.MotionAllowedListener;
-import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.AnalogListener;
-import com.jme3.input.controls.JoyAxisTrigger;
-import com.jme3.input.controls.KeyTrigger;
-import com.jme3.input.controls.MouseAxisTrigger;
-import com.jme3.input.controls.MouseButtonTrigger;
+import com.jme3.input.controls.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Quaternion;
diff --git a/engine/src/core/com/jme3/input/InputManager.java b/engine/src/core/com/jme3/input/InputManager.java
index 6c9a9370d..9d6b7d52f 100644
--- a/engine/src/core/com/jme3/input/InputManager.java
+++ b/engine/src/core/com/jme3/input/InputManager.java
@@ -32,24 +32,8 @@
 package com.jme3.input;
 
 import com.jme3.app.Application;
-import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.AnalogListener;
-import com.jme3.input.controls.InputListener;
-import com.jme3.input.controls.JoyAxisTrigger;
-import com.jme3.input.controls.JoyButtonTrigger;
-import com.jme3.input.controls.KeyTrigger;
-import com.jme3.input.controls.MouseAxisTrigger;
-import com.jme3.input.controls.MouseButtonTrigger;
-import com.jme3.input.controls.TouchListener;
-import com.jme3.input.controls.TouchTrigger;
-import com.jme3.input.controls.Trigger;
-import com.jme3.input.event.InputEvent;
-import com.jme3.input.event.JoyAxisEvent;
-import com.jme3.input.event.JoyButtonEvent;
-import com.jme3.input.event.KeyInputEvent;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-import com.jme3.input.event.TouchEvent;
+import com.jme3.input.controls.*;
+import com.jme3.input.event.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector2f;
 import com.jme3.util.IntMap;
diff --git a/engine/src/core/com/jme3/input/RawInputListener.java b/engine/src/core/com/jme3/input/RawInputListener.java
index c118246bd..dfdd69e33 100644
--- a/engine/src/core/com/jme3/input/RawInputListener.java
+++ b/engine/src/core/com/jme3/input/RawInputListener.java
@@ -32,13 +32,7 @@
 
 package com.jme3.input;
 
-import com.jme3.input.event.InputEvent;
-import com.jme3.input.event.JoyAxisEvent;
-import com.jme3.input.event.JoyButtonEvent;
-import com.jme3.input.event.KeyInputEvent;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-import com.jme3.input.event.TouchEvent;
+import com.jme3.input.event.*;
 
 /**
  * An interface used for receiving raw input from devices.
diff --git a/engine/src/core/com/jme3/input/event/TouchEvent.java b/engine/src/core/com/jme3/input/event/TouchEvent.java
index 2b77c7fc6..8834c851d 100644
--- a/engine/src/core/com/jme3/input/event/TouchEvent.java
+++ b/engine/src/core/com/jme3/input/event/TouchEvent.java
@@ -31,8 +31,6 @@
  */
 package com.jme3.input.event;
 
-import com.jme3.math.Vector2f;
-
 /**
  * <code>TouchEvent</code> represents a single event from multi-touch input devices
  * @author larynx
diff --git a/engine/src/core/com/jme3/light/DirectionalLight.java b/engine/src/core/com/jme3/light/DirectionalLight.java
index 306d804f7..e2bcdee7c 100644
--- a/engine/src/core/com/jme3/light/DirectionalLight.java
+++ b/engine/src/core/com/jme3/light/DirectionalLight.java
@@ -32,9 +32,9 @@
 
 package com.jme3.light;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/light/Light.java b/engine/src/core/com/jme3/light/Light.java
index 009e21ecf..965eaf91d 100644
--- a/engine/src/core/com/jme3/light/Light.java
+++ b/engine/src/core/com/jme3/light/Light.java
@@ -32,11 +32,7 @@
 
 package com.jme3.light;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Spatial;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/light/LightList.java b/engine/src/core/com/jme3/light/LightList.java
index a37b59a2a..00b6b4dc6 100644
--- a/engine/src/core/com/jme3/light/LightList.java
+++ b/engine/src/core/com/jme3/light/LightList.java
@@ -32,20 +32,11 @@
 
 package com.jme3.light;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.scene.Spatial;
 import com.jme3.util.SortUtil;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import java.util.*;
 
 /**
  * <code>LightList</code> is used internally by {@link Spatial}s to manage
diff --git a/engine/src/core/com/jme3/light/PointLight.java b/engine/src/core/com/jme3/light/PointLight.java
index b0c349f9e..e1deeace9 100644
--- a/engine/src/core/com/jme3/light/PointLight.java
+++ b/engine/src/core/com/jme3/light/PointLight.java
@@ -32,9 +32,9 @@
 package com.jme3.light;
 
 import com.jme3.bounding.BoundingVolume;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/light/SpotLight.java b/engine/src/core/com/jme3/light/SpotLight.java
index 332c462be..4c653a5ee 100644
--- a/engine/src/core/com/jme3/light/SpotLight.java
+++ b/engine/src/core/com/jme3/light/SpotLight.java
@@ -32,11 +32,7 @@
 package com.jme3.light;
 
 import com.jme3.bounding.BoundingVolume;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/material/MatParam.java b/engine/src/core/com/jme3/material/MatParam.java
index d81afa83b..b0ef117dd 100644
--- a/engine/src/core/com/jme3/material/MatParam.java
+++ b/engine/src/core/com/jme3/material/MatParam.java
@@ -32,16 +32,8 @@
 package com.jme3.material;
 
 import com.jme3.asset.TextureKey;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.export.*;
+import com.jme3.math.*;
 import com.jme3.renderer.GL1Renderer;
 import com.jme3.renderer.Renderer;
 import com.jme3.shader.VarType;
diff --git a/engine/src/core/com/jme3/material/Material.java b/engine/src/core/com/jme3/material/Material.java
index 8dc5015c6..ee8feb1f7 100644
--- a/engine/src/core/com/jme3/material/Material.java
+++ b/engine/src/core/com/jme3/material/Material.java
@@ -31,28 +31,14 @@ package com.jme3.material;
 
 import com.jme3.asset.Asset;
 import com.jme3.asset.AssetKey;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Vector2f;
 import com.jme3.asset.AssetManager;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.light.AmbientLight;
-import com.jme3.light.DirectionalLight;
-import com.jme3.light.Light;
-import com.jme3.light.LightList;
-import com.jme3.light.PointLight;
-import com.jme3.light.SpotLight;
+import com.jme3.export.*;
+import com.jme3.light.*;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.material.RenderState.FaceCullMode;
 import com.jme3.material.TechniqueDef.LightMode;
 import com.jme3.material.TechniqueDef.ShadowMode;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.math.*;
 import com.jme3.renderer.Caps;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.Renderer;
@@ -65,11 +51,7 @@ import com.jme3.texture.Texture;
 import com.jme3.util.ListMap;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/material/MaterialDef.java b/engine/src/core/com/jme3/material/MaterialDef.java
index b2eb55e15..e7ec3fcca 100644
--- a/engine/src/core/com/jme3/material/MaterialDef.java
+++ b/engine/src/core/com/jme3/material/MaterialDef.java
@@ -34,11 +34,7 @@ package com.jme3.material;
 
 import com.jme3.asset.AssetManager;
 import com.jme3.shader.VarType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/material/RenderState.java b/engine/src/core/com/jme3/material/RenderState.java
index c6360557d..37897fd58 100644
--- a/engine/src/core/com/jme3/material/RenderState.java
+++ b/engine/src/core/com/jme3/material/RenderState.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.material;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/material/Technique.java b/engine/src/core/com/jme3/material/Technique.java
index 6ec0f6671..74907c970 100644
--- a/engine/src/core/com/jme3/material/Technique.java
+++ b/engine/src/core/com/jme3/material/Technique.java
@@ -32,17 +32,8 @@
 package com.jme3.material;
 
 import com.jme3.asset.AssetManager;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.shader.DefineList;
-import com.jme3.shader.Shader;
-import com.jme3.shader.ShaderKey;
-import com.jme3.shader.Uniform;
-import com.jme3.shader.UniformBinding;
-import com.jme3.shader.VarType;
+import com.jme3.export.*;
+import com.jme3.shader.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/engine/src/core/com/jme3/material/TechniqueDef.java b/engine/src/core/com/jme3/material/TechniqueDef.java
index 6a9a56f7f..aaeb34004 100644
--- a/engine/src/core/com/jme3/material/TechniqueDef.java
+++ b/engine/src/core/com/jme3/material/TechniqueDef.java
@@ -32,11 +32,7 @@
 
 package com.jme3.material;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.renderer.Caps;
 import com.jme3.renderer.Renderer;
 import com.jme3.shader.DefineList;
diff --git a/engine/src/core/com/jme3/math/AbstractTriangle.java b/engine/src/core/com/jme3/math/AbstractTriangle.java
index 6c9d3dc60..1ea6da535 100644
--- a/engine/src/core/com/jme3/math/AbstractTriangle.java
+++ b/engine/src/core/com/jme3/math/AbstractTriangle.java
@@ -32,7 +32,8 @@
 
 package com.jme3.math;
 
-import com.jme3.collision.*;
+import com.jme3.collision.Collidable;
+import com.jme3.collision.CollisionResults;
 
 public abstract class AbstractTriangle implements Collidable {
 
diff --git a/engine/src/core/com/jme3/math/ColorRGBA.java b/engine/src/core/com/jme3/math/ColorRGBA.java
index cf023d552..a22d45382 100644
--- a/engine/src/core/com/jme3/math/ColorRGBA.java
+++ b/engine/src/core/com/jme3/math/ColorRGBA.java
@@ -29,11 +29,7 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/core/com/jme3/math/CurveAndSurfaceMath.java b/engine/src/core/com/jme3/math/CurveAndSurfaceMath.java
index e26660be9..079880ff7 100644
--- a/engine/src/core/com/jme3/math/CurveAndSurfaceMath.java
+++ b/engine/src/core/com/jme3/math/CurveAndSurfaceMath.java
@@ -1,8 +1,7 @@
 package com.jme3.math;
 
-import java.util.List;
-
 import com.jme3.math.Spline.SplineType;
+import java.util.List;
 
 /**
  * This class offers methods to help with curves and surfaces calculations.
diff --git a/engine/src/core/com/jme3/math/Line.java b/engine/src/core/com/jme3/math/Line.java
index 0edd2062c..a0fa79bb4 100644
--- a/engine/src/core/com/jme3/math/Line.java
+++ b/engine/src/core/com/jme3/math/Line.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/math/LineSegment.java b/engine/src/core/com/jme3/math/LineSegment.java
index cca506553..c86619c59 100644
--- a/engine/src/core/com/jme3/math/LineSegment.java
+++ b/engine/src/core/com/jme3/math/LineSegment.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.TempVars;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/math/Matrix3f.java b/engine/src/core/com/jme3/math/Matrix3f.java
index 7251e420c..76d50fa53 100644
--- a/engine/src/core/com/jme3/math/Matrix3f.java
+++ b/engine/src/core/com/jme3/math/Matrix3f.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/math/Matrix4f.java b/engine/src/core/com/jme3/math/Matrix4f.java
index 32bea54a6..8521eab54 100644
--- a/engine/src/core/com/jme3/math/Matrix4f.java
+++ b/engine/src/core/com/jme3/math/Matrix4f.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
 import java.io.IOException;
diff --git a/engine/src/core/com/jme3/math/Plane.java b/engine/src/core/com/jme3/math/Plane.java
index 2154b67eb..bd490d6a7 100644
--- a/engine/src/core/com/jme3/math/Plane.java
+++ b/engine/src/core/com/jme3/math/Plane.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/math/Quaternion.java b/engine/src/core/com/jme3/math/Quaternion.java
index e42aa382e..5a5a1c9bd 100644
--- a/engine/src/core/com/jme3/math/Quaternion.java
+++ b/engine/src/core/com/jme3/math/Quaternion.java
@@ -31,17 +31,12 @@
  */
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.TempVars;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.nio.FloatBuffer;
 import java.util.logging.Logger;
 
 /**
diff --git a/engine/src/core/com/jme3/math/Ray.java b/engine/src/core/com/jme3/math/Ray.java
index c39094c38..cfac314c0 100644
--- a/engine/src/core/com/jme3/math/Ray.java
+++ b/engine/src/core/com/jme3/math/Ray.java
@@ -36,11 +36,7 @@ import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResult;
 import com.jme3.collision.CollisionResults;
 import com.jme3.collision.UnsupportedCollisionException;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.TempVars;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/math/Rectangle.java b/engine/src/core/com/jme3/math/Rectangle.java
index 8504a12c8..310270c1f 100644
--- a/engine/src/core/com/jme3/math/Rectangle.java
+++ b/engine/src/core/com/jme3/math/Rectangle.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 
diff --git a/engine/src/core/com/jme3/math/Ring.java b/engine/src/core/com/jme3/math/Ring.java
index 8931da76a..20f1ea4ea 100644
--- a/engine/src/core/com/jme3/math/Ring.java
+++ b/engine/src/core/com/jme3/math/Ring.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 
diff --git a/engine/src/core/com/jme3/math/Spline.java b/engine/src/core/com/jme3/math/Spline.java
index 788990b46..b28a79720 100644
--- a/engine/src/core/com/jme3/math/Spline.java
+++ b/engine/src/core/com/jme3/math/Spline.java
@@ -4,17 +4,12 @@
  */
 package com.jme3.math;
 
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-
 /**
  *
  * @author Nehon
diff --git a/engine/src/core/com/jme3/math/Transform.java b/engine/src/core/com/jme3/math/Transform.java
index d91316719..60b522371 100644
--- a/engine/src/core/com/jme3/math/Transform.java
+++ b/engine/src/core/com/jme3/math/Transform.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/core/com/jme3/math/Vector2f.java b/engine/src/core/com/jme3/math/Vector2f.java
index 8091d1cac..c2d8c6f45 100644
--- a/engine/src/core/com/jme3/math/Vector2f.java
+++ b/engine/src/core/com/jme3/math/Vector2f.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
diff --git a/engine/src/core/com/jme3/math/Vector3f.java b/engine/src/core/com/jme3/math/Vector3f.java
index 6d312398e..9f6f851c5 100644
--- a/engine/src/core/com/jme3/math/Vector3f.java
+++ b/engine/src/core/com/jme3/math/Vector3f.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/math/Vector4f.java b/engine/src/core/com/jme3/math/Vector4f.java
index 43657375a..d6e7ad7e8 100644
--- a/engine/src/core/com/jme3/math/Vector4f.java
+++ b/engine/src/core/com/jme3/math/Vector4f.java
@@ -32,11 +32,7 @@
 
 package com.jme3.math;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/post/Filter.java b/engine/src/core/com/jme3/post/Filter.java
index 0c1c01b0e..ef9a6ff88 100644
--- a/engine/src/core/com/jme3/post/Filter.java
+++ b/engine/src/core/com/jme3/post/Filter.java
@@ -32,11 +32,7 @@
 package com.jme3.post;
 
 import com.jme3.asset.AssetManager;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.renderer.Caps;
 import com.jme3.renderer.RenderManager;
diff --git a/engine/src/core/com/jme3/post/FilterPostProcessor.java b/engine/src/core/com/jme3/post/FilterPostProcessor.java
index 9c42ab643..2e48f0f0e 100644
--- a/engine/src/core/com/jme3/post/FilterPostProcessor.java
+++ b/engine/src/core/com/jme3/post/FilterPostProcessor.java
@@ -31,19 +31,11 @@
  */
 package com.jme3.post;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.renderer.Renderer;
-import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.asset.AssetManager;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
-import com.jme3.renderer.Camera;
-import com.jme3.renderer.Caps;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
+import com.jme3.renderer.*;
+import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture2D;
diff --git a/engine/src/core/com/jme3/renderer/Camera.java b/engine/src/core/com/jme3/renderer/Camera.java
index 010648f10..74ba6cfb1 100644
--- a/engine/src/core/com/jme3/renderer/Camera.java
+++ b/engine/src/core/com/jme3/renderer/Camera.java
@@ -33,18 +33,8 @@ package com.jme3.renderer;
 
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingVolume;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Plane;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.export.*;
+import com.jme3.math.*;
 import com.jme3.util.TempVars;
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/engine/src/core/com/jme3/renderer/RenderManager.java b/engine/src/core/com/jme3/renderer/RenderManager.java
index b2a2243d0..c558f8691 100644
--- a/engine/src/core/com/jme3/renderer/RenderManager.java
+++ b/engine/src/core/com/jme3/renderer/RenderManager.java
@@ -35,21 +35,13 @@ import com.jme3.material.Material;
 import com.jme3.material.MaterialDef;
 import com.jme3.material.RenderState;
 import com.jme3.material.Technique;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.queue.GeometryList;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.shader.Uniform;
 import com.jme3.shader.UniformBinding;
 import com.jme3.shader.VarType;
diff --git a/engine/src/core/com/jme3/scene/AssetLinkNode.java b/engine/src/core/com/jme3/scene/AssetLinkNode.java
index cfc477830..e50680c63 100644
--- a/engine/src/core/com/jme3/scene/AssetLinkNode.java
+++ b/engine/src/core/com/jme3/scene/AssetLinkNode.java
@@ -42,12 +42,8 @@ import com.jme3.export.OutputCapsule;
 import com.jme3.export.binary.BinaryImporter;
 import com.jme3.util.SafeArrayList;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/core/com/jme3/scene/BatchNode.java b/engine/src/core/com/jme3/scene/BatchNode.java
index 729304f64..64defc1fe 100644
--- a/engine/src/core/com/jme3/scene/BatchNode.java
+++ b/engine/src/core/com/jme3/scene/BatchNode.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.scene;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Transform;
diff --git a/engine/src/core/com/jme3/scene/Geometry.java b/engine/src/core/com/jme3/scene/Geometry.java
index 2b99aff91..c8efd98c0 100644
--- a/engine/src/core/com/jme3/scene/Geometry.java
+++ b/engine/src/core/com/jme3/scene/Geometry.java
@@ -35,9 +35,9 @@ import com.jme3.asset.AssetNotFoundException;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.material.Material;
 import com.jme3.math.Matrix4f;
diff --git a/engine/src/core/com/jme3/scene/Mesh.java b/engine/src/core/com/jme3/scene/Mesh.java
index 3b0b9de0f..dce7937df 100644
--- a/engine/src/core/com/jme3/scene/Mesh.java
+++ b/engine/src/core/com/jme3/scene/Mesh.java
@@ -32,38 +32,26 @@
 
 package com.jme3.scene;
 
-import com.jme3.scene.mesh.IndexShortBuffer;
-import com.jme3.scene.mesh.IndexIntBuffer;
-import com.jme3.scene.mesh.IndexBuffer;
-import com.jme3.scene.mesh.IndexByteBuffer;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
 import com.jme3.collision.CollisionResults;
 import com.jme3.collision.bih.BIHTree;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.RenderState;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Triangle;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.VertexBuffer.*;
-import com.jme3.scene.mesh.VirtualIndexBuffer;
-import com.jme3.scene.mesh.WrappedIndexBuffer;
+import com.jme3.scene.VertexBuffer.Format;
+import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.scene.VertexBuffer.Usage;
+import com.jme3.scene.mesh.*;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import java.io.IOException;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 import java.util.ArrayList;
 
 /**
diff --git a/engine/src/core/com/jme3/scene/Spatial.java b/engine/src/core/com/jme3/scene/Spatial.java
index 951d113d4..b97067cef 100644
--- a/engine/src/core/com/jme3/scene/Spatial.java
+++ b/engine/src/core/com/jme3/scene/Spatial.java
@@ -35,19 +35,11 @@ import com.jme3.asset.Asset;
 import com.jme3.asset.AssetKey;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.light.Light;
 import com.jme3.light.LightList;
 import com.jme3.material.Material;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Transform;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
@@ -58,12 +50,7 @@ import com.jme3.scene.control.Control;
 import com.jme3.util.SafeArrayList;
 import com.jme3.util.TempVars;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.*;
 import java.util.logging.Logger;
 
 /**
diff --git a/engine/src/core/com/jme3/scene/UserData.java b/engine/src/core/com/jme3/scene/UserData.java
index 8a18f77cc..855a31c32 100644
--- a/engine/src/core/com/jme3/scene/UserData.java
+++ b/engine/src/core/com/jme3/scene/UserData.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.scene;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/core/com/jme3/scene/VertexBuffer.java b/engine/src/core/com/jme3/scene/VertexBuffer.java
index e2279ac9a..20c9723c2 100644
--- a/engine/src/core/com/jme3/scene/VertexBuffer.java
+++ b/engine/src/core/com/jme3/scene/VertexBuffer.java
@@ -32,21 +32,13 @@
 
 package com.jme3.scene;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.FastMath;
-import com.jme3.util.NativeObject;
 import com.jme3.renderer.Renderer;
 import com.jme3.util.BufferUtils;
+import com.jme3.util.NativeObject;
 import java.io.IOException;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 
 /**
  * A <code>VertexBuffer</code> contains a particular type of geometry
diff --git a/engine/src/core/com/jme3/scene/control/AbstractControl.java b/engine/src/core/com/jme3/scene/control/AbstractControl.java
index 2f3875e82..2887ec9d0 100644
--- a/engine/src/core/com/jme3/scene/control/AbstractControl.java
+++ b/engine/src/core/com/jme3/scene/control/AbstractControl.java
@@ -32,9 +32,9 @@
 
 package com.jme3.scene.control;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
diff --git a/engine/src/core/com/jme3/scene/control/BillboardControl.java b/engine/src/core/com/jme3/scene/control/BillboardControl.java
index d804bc3bb..40c2fea51 100644
--- a/engine/src/core/com/jme3/scene/control/BillboardControl.java
+++ b/engine/src/core/com/jme3/scene/control/BillboardControl.java
@@ -32,8 +32,6 @@
 
 package com.jme3.scene.control;
 
-import java.io.IOException;
-
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
@@ -47,6 +45,7 @@ import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import java.io.IOException;
 
 public class BillboardControl extends AbstractControl {
 
diff --git a/engine/src/core/com/jme3/scene/control/LightControl.java b/engine/src/core/com/jme3/scene/control/LightControl.java
index a51539534..2859c9bb5 100644
--- a/engine/src/core/com/jme3/scene/control/LightControl.java
+++ b/engine/src/core/com/jme3/scene/control/LightControl.java
@@ -36,9 +36,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
 import com.jme3.light.PointLight;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
-import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/core/com/jme3/scene/control/LodControl.java b/engine/src/core/com/jme3/scene/control/LodControl.java
index 23aaed016..6cbfefb55 100644
--- a/engine/src/core/com/jme3/scene/control/LodControl.java
+++ b/engine/src/core/com/jme3/scene/control/LodControl.java
@@ -33,9 +33,9 @@
 package com.jme3.scene.control;
 
 import com.jme3.bounding.BoundingVolume;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.renderer.Camera;
diff --git a/engine/src/core/com/jme3/scene/debug/SkeletonWire.java b/engine/src/core/com/jme3/scene/debug/SkeletonWire.java
index 926ddab11..0796334cb 100644
--- a/engine/src/core/com/jme3/scene/debug/SkeletonWire.java
+++ b/engine/src/core/com/jme3/scene/debug/SkeletonWire.java
@@ -41,7 +41,6 @@ import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.util.BufferUtils;
-import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
 
diff --git a/engine/src/core/com/jme3/scene/shape/AbstractBox.java b/engine/src/core/com/jme3/scene/shape/AbstractBox.java
index ef2334953..6c68dc550 100644
--- a/engine/src/core/com/jme3/scene/shape/AbstractBox.java
+++ b/engine/src/core/com/jme3/scene/shape/AbstractBox.java
@@ -32,9 +32,9 @@
 
 package com.jme3.scene.shape;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
diff --git a/engine/src/core/com/jme3/scene/shape/Cylinder.java b/engine/src/core/com/jme3/scene/shape/Cylinder.java
index a5be3ae49..85bb970fc 100644
--- a/engine/src/core/com/jme3/scene/shape/Cylinder.java
+++ b/engine/src/core/com/jme3/scene/shape/Cylinder.java
@@ -39,12 +39,11 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
 import static com.jme3.util.BufferUtils.*;
-
 import java.io.IOException;
 import java.nio.FloatBuffer;
 
diff --git a/engine/src/core/com/jme3/scene/shape/Dome.java b/engine/src/core/com/jme3/scene/shape/Dome.java
index 5ef5a8a6d..6f429fc22 100644
--- a/engine/src/core/com/jme3/scene/shape/Dome.java
+++ b/engine/src/core/com/jme3/scene/shape/Dome.java
@@ -32,13 +32,13 @@
 // $Id: Dome.java 4131 2009-03-19 20:15:28Z blaine.dev $
 package com.jme3.scene.shape;
 
-import com.jme3.scene.*;
-import com.jme3.export.JmeImporter;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
diff --git a/engine/src/core/com/jme3/scene/shape/PQTorus.java b/engine/src/core/com/jme3/scene/shape/PQTorus.java
index 123009829..1ff70c6e2 100644
--- a/engine/src/core/com/jme3/scene/shape/PQTorus.java
+++ b/engine/src/core/com/jme3/scene/shape/PQTorus.java
@@ -33,16 +33,15 @@
 // $Id: PQTorus.java 4131 2009-03-19 20:15:28Z blaine.dev $
 package com.jme3.scene.shape;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import static com.jme3.util.BufferUtils.*;
-
 import java.io.IOException;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
diff --git a/engine/src/core/com/jme3/scene/shape/Sphere.java b/engine/src/core/com/jme3/scene/shape/Sphere.java
index caea209ac..f8a52815b 100644
--- a/engine/src/core/com/jme3/scene/shape/Sphere.java
+++ b/engine/src/core/com/jme3/scene/shape/Sphere.java
@@ -32,13 +32,13 @@
 // $Id: Sphere.java 4163 2009-03-25 01:14:55Z matt.yellen $
 package com.jme3.scene.shape;
 
-import com.jme3.scene.*;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
diff --git a/engine/src/core/com/jme3/scene/shape/Surface.java b/engine/src/core/com/jme3/scene/shape/Surface.java
index 2aba947a0..77d259bd5 100644
--- a/engine/src/core/com/jme3/scene/shape/Surface.java
+++ b/engine/src/core/com/jme3/scene/shape/Surface.java
@@ -1,17 +1,16 @@
 package com.jme3.scene.shape;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.jme3.math.FastMath;
 import com.jme3.math.CurveAndSurfaceMath;
+import com.jme3.math.FastMath;
 import com.jme3.math.Spline.SplineType;
 import com.jme3.math.Vector3f;
 import com.jme3.math.Vector4f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.util.BufferUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This class represents a surface described by knots, weights and control points.
diff --git a/engine/src/core/com/jme3/scene/shape/Torus.java b/engine/src/core/com/jme3/scene/shape/Torus.java
index c8f5a9df2..22059bf8e 100644
--- a/engine/src/core/com/jme3/scene/shape/Torus.java
+++ b/engine/src/core/com/jme3/scene/shape/Torus.java
@@ -33,9 +33,9 @@
 // $Id: Torus.java 4131 2009-03-19 20:15:28Z blaine.dev $
 package com.jme3.scene.shape;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/core/com/jme3/shader/DefineList.java b/engine/src/core/com/jme3/shader/DefineList.java
index 043897663..c29439422 100644
--- a/engine/src/core/com/jme3/shader/DefineList.java
+++ b/engine/src/core/com/jme3/shader/DefineList.java
@@ -32,11 +32,7 @@
 
 package com.jme3.shader;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 import java.util.Map;
 import java.util.SortedMap;
diff --git a/engine/src/core/com/jme3/shader/Shader.java b/engine/src/core/com/jme3/shader/Shader.java
index 65a07d7c8..265eed6a0 100644
--- a/engine/src/core/com/jme3/shader/Shader.java
+++ b/engine/src/core/com/jme3/shader/Shader.java
@@ -32,17 +32,13 @@
 
 package com.jme3.shader;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
-import com.jme3.util.NativeObject;
+import com.jme3.export.*;
 import com.jme3.renderer.Renderer;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import com.jme3.util.ListMap;
+import com.jme3.util.NativeObject;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/engine/src/core/com/jme3/shader/ShaderVariable.java b/engine/src/core/com/jme3/shader/ShaderVariable.java
index 02f20dace..7dbd2e251 100644
--- a/engine/src/core/com/jme3/shader/ShaderVariable.java
+++ b/engine/src/core/com/jme3/shader/ShaderVariable.java
@@ -32,11 +32,7 @@
 
 package com.jme3.shader;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import java.io.IOException;
 
 public class ShaderVariable implements Savable {
diff --git a/engine/src/core/com/jme3/shader/Uniform.java b/engine/src/core/com/jme3/shader/Uniform.java
index 76e7cb6a3..228e0974a 100644
--- a/engine/src/core/com/jme3/shader/Uniform.java
+++ b/engine/src/core/com/jme3/shader/Uniform.java
@@ -32,16 +32,11 @@
 
 package com.jme3.shader;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.util.BufferUtils;
 import java.io.IOException;
 import java.nio.FloatBuffer;
diff --git a/engine/src/core/com/jme3/shader/UniformBinding.java b/engine/src/core/com/jme3/shader/UniformBinding.java
index bd5d1d24a..454853e4c 100644
--- a/engine/src/core/com/jme3/shader/UniformBinding.java
+++ b/engine/src/core/com/jme3/shader/UniformBinding.java
@@ -32,8 +32,6 @@
 
 package com.jme3.shader;
 
-import com.jme3.light.AmbientLight;
-
 public enum UniformBinding {
 
     /**
diff --git a/engine/src/core/com/jme3/system/Annotations.java b/engine/src/core/com/jme3/system/Annotations.java
index e68142d4e..0cf72ebbc 100644
--- a/engine/src/core/com/jme3/system/Annotations.java
+++ b/engine/src/core/com/jme3/system/Annotations.java
@@ -32,11 +32,7 @@
 package com.jme3.system;
 
 import checkers.quals.TypeQualifier;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * This class contains the Annotation definitions for jME3. Mostly these are used
diff --git a/engine/src/core/com/jme3/system/AppSettings.java b/engine/src/core/com/jme3/system/AppSettings.java
index d23110ed9..87a2374f3 100644
--- a/engine/src/core/com/jme3/system/AppSettings.java
+++ b/engine/src/core/com/jme3/system/AppSettings.java
@@ -31,7 +31,6 @@
  */
 package com.jme3.system;
 
-import com.jme3.renderer.Renderer;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/engine/src/core/com/jme3/system/Natives.java b/engine/src/core/com/jme3/system/Natives.java
index 9ceb7098b..4402b15ee 100644
--- a/engine/src/core/com/jme3/system/Natives.java
+++ b/engine/src/core/com/jme3/system/Natives.java
@@ -31,12 +31,7 @@
  */
 package com.jme3.system;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
diff --git a/engine/src/core/com/jme3/texture/FrameBuffer.java b/engine/src/core/com/jme3/texture/FrameBuffer.java
index be2d0936a..c09ec76df 100644
--- a/engine/src/core/com/jme3/texture/FrameBuffer.java
+++ b/engine/src/core/com/jme3/texture/FrameBuffer.java
@@ -33,9 +33,9 @@
 package com.jme3.texture;
 
 import com.jme3.renderer.Caps;
-import com.jme3.util.NativeObject;
 import com.jme3.renderer.Renderer;
 import com.jme3.texture.Image.Format;
+import com.jme3.util.NativeObject;
 import java.util.ArrayList;
 
 /**
diff --git a/engine/src/core/com/jme3/texture/Image.java b/engine/src/core/com/jme3/texture/Image.java
index 755f4e20f..37c8905f0 100644
--- a/engine/src/core/com/jme3/texture/Image.java
+++ b/engine/src/core/com/jme3/texture/Image.java
@@ -32,18 +32,14 @@
 
 package com.jme3.texture;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
+import com.jme3.export.*;
 import com.jme3.renderer.Renderer;
+import com.jme3.util.NativeObject;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import com.jme3.export.Savable;
-import com.jme3.util.NativeObject;
 
 /**
  * <code>Image</code> defines a data format for a graphical image. The image
diff --git a/engine/src/core/com/jme3/texture/Texture.java b/engine/src/core/com/jme3/texture/Texture.java
index 9ad7c2eee..1efedec14 100644
--- a/engine/src/core/com/jme3/texture/Texture.java
+++ b/engine/src/core/com/jme3/texture/Texture.java
@@ -36,11 +36,7 @@ import com.jme3.asset.Asset;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.asset.TextureKey;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.util.PlaceholderAssets;
 import java.io.IOException;
 import java.util.logging.Level;
diff --git a/engine/src/core/com/jme3/texture/Texture2D.java b/engine/src/core/com/jme3/texture/Texture2D.java
index cb0a733cf..959841352 100644
--- a/engine/src/core/com/jme3/texture/Texture2D.java
+++ b/engine/src/core/com/jme3/texture/Texture2D.java
@@ -32,9 +32,9 @@
 
 package com.jme3.texture;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/texture/Texture3D.java b/engine/src/core/com/jme3/texture/Texture3D.java
index 90333b595..bded644e0 100644
--- a/engine/src/core/com/jme3/texture/Texture3D.java
+++ b/engine/src/core/com/jme3/texture/Texture3D.java
@@ -31,9 +31,9 @@
  */
 package com.jme3.texture;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/texture/TextureCubeMap.java b/engine/src/core/com/jme3/texture/TextureCubeMap.java
index 9b256d66d..9290d8a9a 100644
--- a/engine/src/core/com/jme3/texture/TextureCubeMap.java
+++ b/engine/src/core/com/jme3/texture/TextureCubeMap.java
@@ -32,9 +32,9 @@
 
 package com.jme3.texture;
 
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 
diff --git a/engine/src/core/com/jme3/ui/Picture.java b/engine/src/core/com/jme3/ui/Picture.java
index bc4fece3b..81371f5a1 100644
--- a/engine/src/core/com/jme3/ui/Picture.java
+++ b/engine/src/core/com/jme3/ui/Picture.java
@@ -32,13 +32,13 @@
 
 package com.jme3.ui;
 
-import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.TextureKey;
+import com.jme3.material.Material;
 import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture2D;
diff --git a/engine/src/core/com/jme3/util/BufferUtils.java b/engine/src/core/com/jme3/util/BufferUtils.java
index 64dbcf544..b334e6fd4 100644
--- a/engine/src/core/com/jme3/util/BufferUtils.java
+++ b/engine/src/core/com/jme3/util/BufferUtils.java
@@ -35,13 +35,7 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
diff --git a/engine/src/core/com/jme3/util/LittleEndien.java b/engine/src/core/com/jme3/util/LittleEndien.java
index 7e6c74b9d..0f715966d 100644
--- a/engine/src/core/com/jme3/util/LittleEndien.java
+++ b/engine/src/core/com/jme3/util/LittleEndien.java
@@ -31,12 +31,7 @@
  */
 package com.jme3.util;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 
 /**
  * <code>LittleEndien</code> is a class to read littleendien stored data
diff --git a/engine/src/core/com/jme3/util/NativeObject.java b/engine/src/core/com/jme3/util/NativeObject.java
index f4e7bf12e..51a0d1485 100644
--- a/engine/src/core/com/jme3/util/NativeObject.java
+++ b/engine/src/core/com/jme3/util/NativeObject.java
@@ -32,8 +32,6 @@
 
 package com.jme3.util;
 
-import com.jme3.renderer.Renderer;
-
 /**
  * Describes a native object. An encapsulation of a certain object 
  * on the native side of the graphics or audio library.
diff --git a/engine/src/core/com/jme3/util/PlaceholderAssets.java b/engine/src/core/com/jme3/util/PlaceholderAssets.java
index 2bf8dbb3f..c36abc91d 100644
--- a/engine/src/core/com/jme3/util/PlaceholderAssets.java
+++ b/engine/src/core/com/jme3/util/PlaceholderAssets.java
@@ -3,13 +3,13 @@ package com.jme3.util;
 import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioBuffer;
 import com.jme3.audio.AudioData;
-import com.jme3.texture.Image;
-import com.jme3.texture.Image.Format;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Box;
+import com.jme3.texture.Image;
+import com.jme3.texture.Image.Format;
 import java.nio.ByteBuffer;
 
 public class PlaceholderAssets {
diff --git a/engine/src/core/com/jme3/util/TangentBinormalGenerator.java b/engine/src/core/com/jme3/util/TangentBinormalGenerator.java
index a74eb7401..88f68220f 100644
--- a/engine/src/core/com/jme3/util/TangentBinormalGenerator.java
+++ b/engine/src/core/com/jme3/util/TangentBinormalGenerator.java
@@ -31,26 +31,21 @@
  */
 package com.jme3.util;
 
-import com.jme3.scene.VertexBuffer;
-import com.jme3.scene.VertexBuffer.Format;
-import com.jme3.scene.VertexBuffer.Usage;
-import java.util.logging.Level;
-import com.jme3.scene.mesh.IndexBuffer;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Mesh;
+import com.jme3.scene.*;
+import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.scene.VertexBuffer.Usage;
+import com.jme3.scene.mesh.IndexBuffer;
+import static com.jme3.util.BufferUtils.*;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-
 import java.util.ArrayList;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import static com.jme3.util.BufferUtils.*;
 
 /**
  * 
diff --git a/engine/src/core/com/jme3/util/TempVars.java b/engine/src/core/com/jme3/util/TempVars.java
index 629b87d99..2fdea3654 100644
--- a/engine/src/core/com/jme3/util/TempVars.java
+++ b/engine/src/core/com/jme3/util/TempVars.java
@@ -32,16 +32,7 @@
 package com.jme3.util;
 
 import com.jme3.collision.bih.BIHNode.BIHStackData;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Eigen3f;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Plane;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Triangle;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
+import com.jme3.math.*;
 import com.jme3.scene.Spatial;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
diff --git a/engine/src/desktop-fx/com/jme3/post/HDRRenderer.java b/engine/src/desktop-fx/com/jme3/post/HDRRenderer.java
index f52bc7d63..bac8334ab 100644
--- a/engine/src/desktop-fx/com/jme3/post/HDRRenderer.java
+++ b/engine/src/desktop-fx/com/jme3/post/HDRRenderer.java
@@ -32,15 +32,10 @@
 
 package com.jme3.post;
 
-import com.jme3.post.SceneProcessor;
+import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
 import com.jme3.math.Vector2f;
-import com.jme3.renderer.Renderer;
-import com.jme3.asset.AssetManager;
-import com.jme3.renderer.Camera;
-import com.jme3.renderer.Caps;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
+import com.jme3.renderer.*;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Image;
diff --git a/engine/src/desktop-fx/com/jme3/post/filters/DepthOfFieldFilter.java b/engine/src/desktop-fx/com/jme3/post/filters/DepthOfFieldFilter.java
index b360e5c66..55591c988 100644
--- a/engine/src/desktop-fx/com/jme3/post/filters/DepthOfFieldFilter.java
+++ b/engine/src/desktop-fx/com/jme3/post/filters/DepthOfFieldFilter.java
@@ -32,8 +32,8 @@
 package com.jme3.post.filters;
 
 import com.jme3.asset.AssetManager;
-import com.jme3.post.Filter;
 import com.jme3.material.Material;
+import com.jme3.post.Filter;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 
diff --git a/engine/src/desktop-fx/com/jme3/shadow/BasicShadowRenderer.java b/engine/src/desktop-fx/com/jme3/shadow/BasicShadowRenderer.java
index 73a2c737f..3fd01c93f 100644
--- a/engine/src/desktop-fx/com/jme3/shadow/BasicShadowRenderer.java
+++ b/engine/src/desktop-fx/com/jme3/shadow/BasicShadowRenderer.java
@@ -31,17 +31,17 @@
  */
 package com.jme3.shadow;
 
+import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
+import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.Camera;
+import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.Renderer;
+import com.jme3.renderer.ViewPort;
+import com.jme3.renderer.queue.GeometryList;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
-import com.jme3.renderer.queue.GeometryList;
-import com.jme3.asset.AssetManager;
-import com.jme3.post.SceneProcessor;
-import com.jme3.renderer.RenderManager;
-import com.jme3.renderer.ViewPort;
 import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture2D;
diff --git a/engine/src/desktop-fx/com/jme3/shadow/PssmShadowRenderer.java b/engine/src/desktop-fx/com/jme3/shadow/PssmShadowRenderer.java
index dd934a224..fb9924033 100644
--- a/engine/src/desktop-fx/com/jme3/shadow/PssmShadowRenderer.java
+++ b/engine/src/desktop-fx/com/jme3/shadow/PssmShadowRenderer.java
@@ -29,20 +29,20 @@
  */
 package com.jme3.shadow;
 
-import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.Camera;
-import com.jme3.renderer.Renderer;
-import com.jme3.renderer.queue.RenderQueue;
-import com.jme3.renderer.queue.RenderQueue.ShadowMode;
-import com.jme3.renderer.queue.GeometryList;
 import com.jme3.asset.AssetManager;
+import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Matrix4f;
+import com.jme3.math.Vector3f;
 import com.jme3.post.SceneProcessor;
+import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
+import com.jme3.renderer.queue.GeometryList;
 import com.jme3.renderer.queue.OpaqueComparator;
+import com.jme3.renderer.queue.RenderQueue;
+import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.WireFrustum;
diff --git a/engine/src/desktop-fx/com/jme3/shadow/PssmShadowUtil.java b/engine/src/desktop-fx/com/jme3/shadow/PssmShadowUtil.java
index bce306134..263362565 100644
--- a/engine/src/desktop-fx/com/jme3/shadow/PssmShadowUtil.java
+++ b/engine/src/desktop-fx/com/jme3/shadow/PssmShadowUtil.java
@@ -36,10 +36,8 @@ import com.jme3.math.FastMath;
 import com.jme3.math.Matrix4f;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.queue.GeometryList;
-
-import java.util.Arrays;
-
-import static java.lang.Math.*;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 /**
  * Includes various useful shadow mapping functions.
diff --git a/engine/src/desktop-fx/com/jme3/shadow/ShadowUtil.java b/engine/src/desktop-fx/com/jme3/shadow/ShadowUtil.java
index 7260ea642..c488f5e89 100644
--- a/engine/src/desktop-fx/com/jme3/shadow/ShadowUtil.java
+++ b/engine/src/desktop-fx/com/jme3/shadow/ShadowUtil.java
@@ -39,13 +39,12 @@ import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.queue.GeometryList;
-
 import com.jme3.scene.Geometry;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 import java.util.ArrayList;
 import java.util.List;
 
-import static java.lang.Math.*;
-
 /**
  * Includes various useful shadow mapping functions.
  *
diff --git a/engine/src/desktop-fx/com/jme3/water/SimpleWaterProcessor.java b/engine/src/desktop-fx/com/jme3/water/SimpleWaterProcessor.java
index 5739ac690..70ccd1130 100644
--- a/engine/src/desktop-fx/com/jme3/water/SimpleWaterProcessor.java
+++ b/engine/src/desktop-fx/com/jme3/water/SimpleWaterProcessor.java
@@ -33,13 +33,7 @@ package com.jme3.water;
 
 import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Plane;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Ray;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
diff --git a/engine/src/desktop-fx/com/jme3/water/WaterFilter.java b/engine/src/desktop-fx/com/jme3/water/WaterFilter.java
index 6eb9fdab5..d54a192f2 100644
--- a/engine/src/desktop-fx/com/jme3/water/WaterFilter.java
+++ b/engine/src/desktop-fx/com/jme3/water/WaterFilter.java
@@ -39,12 +39,7 @@ import com.jme3.export.OutputCapsule;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Plane;
-import com.jme3.math.Ray;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.Filter;
 import com.jme3.post.Filter.Pass;
 import com.jme3.renderer.Camera;
diff --git a/engine/src/desktop/com/jme3/app/AppletHarness.java b/engine/src/desktop/com/jme3/app/AppletHarness.java
index 7368ff373..7e14c3928 100644
--- a/engine/src/desktop/com/jme3/app/AppletHarness.java
+++ b/engine/src/desktop/com/jme3/app/AppletHarness.java
@@ -43,8 +43,6 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
diff --git a/engine/src/desktop/com/jme3/app/SettingsDialog.java b/engine/src/desktop/com/jme3/app/SettingsDialog.java
index e10920b9e..40b5e7bd6 100644
--- a/engine/src/desktop/com/jme3/app/SettingsDialog.java
+++ b/engine/src/desktop/com/jme3/app/SettingsDialog.java
@@ -31,20 +31,9 @@
  */
 package com.jme3.app;
 
-import com.jme3.system.*;
-import java.awt.BorderLayout;
-import java.awt.DisplayMode;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import com.jme3.system.AppSettings;
+import java.awt.*;
+import java.awt.event.*;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -56,17 +45,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.BackingStoreException;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
+import javax.swing.*;
 
 /**
  * <code>PropertiesDialog</code> provides an interface to make use of the
diff --git a/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java b/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java
index 254370e37..6ae801953 100644
--- a/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java
+++ b/engine/src/desktop/com/jme3/app/state/VideoRecorderAppState.java
@@ -12,15 +12,10 @@ import com.jme3.texture.FrameBuffer;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.Screenshots;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.File;
 import java.nio.ByteBuffer;
-
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/desktop/com/jme3/input/awt/AwtMouseInput.java b/engine/src/desktop/com/jme3/input/awt/AwtMouseInput.java
index 1501f08ba..e83c92af0 100644
--- a/engine/src/desktop/com/jme3/input/awt/AwtMouseInput.java
+++ b/engine/src/desktop/com/jme3/input/awt/AwtMouseInput.java
@@ -32,28 +32,18 @@
 
 package com.jme3.input.awt;
 
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Point;
-import java.awt.Robot;
-import java.awt.Toolkit;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
+import com.jme3.input.MouseInput;
+import com.jme3.input.RawInputListener;
+import com.jme3.input.event.MouseButtonEvent;
+import com.jme3.input.event.MouseMotionEvent;
+import java.awt.*;
+import java.awt.event.*;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.swing.SwingUtilities;
 
-import com.jme3.input.MouseInput;
-import com.jme3.input.RawInputListener;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-
 /**
  * <code>AwtMouseInput</code>
  *
diff --git a/engine/src/desktop/com/jme3/system/JmeDesktopSystem.java b/engine/src/desktop/com/jme3/system/JmeDesktopSystem.java
index 5bf8576f3..9a8eac43f 100644
--- a/engine/src/desktop/com/jme3/system/JmeDesktopSystem.java
+++ b/engine/src/desktop/com/jme3/system/JmeDesktopSystem.java
@@ -37,13 +37,7 @@ import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetNotFoundException;
 import com.jme3.asset.DesktopAssetManager;
 import com.jme3.audio.AudioRenderer;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeContext;
 import com.jme3.system.JmeContext.Type;
-import com.jme3.system.JmeSystem;
-import com.jme3.system.JmeSystemDelegate;
-import com.jme3.system.Natives;
-import com.jme3.system.NullContext;
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/engine/src/desktop/com/jme3/system/awt/AwtPanel.java b/engine/src/desktop/com/jme3/system/awt/AwtPanel.java
index d80e24792..acde2d1fa 100644
--- a/engine/src/desktop/com/jme3/system/awt/AwtPanel.java
+++ b/engine/src/desktop/com/jme3/system/awt/AwtPanel.java
@@ -8,13 +8,7 @@ import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Image.Format;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.Screenshots;
-import java.awt.AWTException;
-import java.awt.BufferCapabilities;
-import java.awt.Canvas;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.ImageCapabilities;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.geom.AffineTransform;
diff --git a/engine/src/desktop/com/jme3/system/awt/AwtPanelsContext.java b/engine/src/desktop/com/jme3/system/awt/AwtPanelsContext.java
index 56c7289f7..c980c4022 100644
--- a/engine/src/desktop/com/jme3/system/awt/AwtPanelsContext.java
+++ b/engine/src/desktop/com/jme3/system/awt/AwtPanelsContext.java
@@ -7,11 +7,7 @@ import com.jme3.input.TouchInput;
 import com.jme3.input.awt.AwtKeyInput;
 import com.jme3.input.awt.AwtMouseInput;
 import com.jme3.renderer.Renderer;
-import com.jme3.system.AppSettings;
-import com.jme3.system.JmeContext;
-import com.jme3.system.JmeSystem;
-import com.jme3.system.SystemListener;
-import com.jme3.system.Timer;
+import com.jme3.system.*;
 import java.util.ArrayList;
 
 public class AwtPanelsContext implements JmeContext {
diff --git a/engine/src/desktop/com/jme3/texture/plugins/AWTLoader.java b/engine/src/desktop/com/jme3/texture/plugins/AWTLoader.java
index ff944f56d..b5dd32b0b 100644
--- a/engine/src/desktop/com/jme3/texture/plugins/AWTLoader.java
+++ b/engine/src/desktop/com/jme3/texture/plugins/AWTLoader.java
@@ -32,19 +32,15 @@
 
 package com.jme3.texture.plugins;
 
-import com.jme3.asset.*;
+import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetLoader;
+import com.jme3.asset.TextureKey;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import com.jme3.util.BufferUtils;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ComponentColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.DirectColorModel;
+import java.awt.image.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/engine/src/desktop/jme3tools/converters/ImageToAwt.java b/engine/src/desktop/jme3tools/converters/ImageToAwt.java
index 3dc86c2e4..836cc7ac0 100644
--- a/engine/src/desktop/jme3tools/converters/ImageToAwt.java
+++ b/engine/src/desktop/jme3tools/converters/ImageToAwt.java
@@ -38,12 +38,7 @@ import com.jme3.texture.plugins.AWTLoader;
 import com.jme3.util.BufferUtils;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ComponentColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
+import java.awt.image.*;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.EnumMap;
diff --git a/engine/src/desktop/jme3tools/navigation/Coordinate.java b/engine/src/desktop/jme3tools/navigation/Coordinate.java
index 53195e8a2..6e2c2d238 100644
--- a/engine/src/desktop/jme3tools/navigation/Coordinate.java
+++ b/engine/src/desktop/jme3tools/navigation/Coordinate.java
@@ -4,10 +4,7 @@
  */
 package jme3tools.navigation;
 
-import jme3tools.navigation.InvalidPositionException;
 import java.text.DecimalFormat;
-import jme3tools.navigation.StringUtil;
-import jme3tools.navigation.NumUtil;
 
 /**
  * Coordinate class. Used to store a coordinate in [DD]D MM.M format.
diff --git a/engine/src/desktop/jme3tools/navigation/MapModel2D.java b/engine/src/desktop/jme3tools/navigation/MapModel2D.java
index 1e6ec362b..d4643675c 100644
--- a/engine/src/desktop/jme3tools/navigation/MapModel2D.java
+++ b/engine/src/desktop/jme3tools/navigation/MapModel2D.java
@@ -1,9 +1,6 @@
 package jme3tools.navigation;
-import jme3tools.navigation.InvalidPositionException;
 import java.awt.Point;
 import java.text.DecimalFormat;
-import jme3tools.navigation.Position;
-import jme3tools.navigation.NavCalculator;
 
 /*
  * To change this template, choose Tools | Templates
diff --git a/engine/src/desktop/jme3tools/navigation/MapModel3D.java b/engine/src/desktop/jme3tools/navigation/MapModel3D.java
index de20cb6b9..81000f563 100644
--- a/engine/src/desktop/jme3tools/navigation/MapModel3D.java
+++ b/engine/src/desktop/jme3tools/navigation/MapModel3D.java
@@ -5,11 +5,7 @@
 package jme3tools.navigation;
 
 import com.jme3.math.Vector3f;
-import jme3tools.navigation.Position;
-import jme3tools.navigation.InvalidPositionException;
-import java.awt.Point;
 import java.text.DecimalFormat;
-import jme3tools.navigation.NavCalculator;
 
 
 /**
diff --git a/engine/src/desktop/jme3tools/navigation/NavCalculator.java b/engine/src/desktop/jme3tools/navigation/NavCalculator.java
index 8e345036f..d685f9a09 100644
--- a/engine/src/desktop/jme3tools/navigation/NavCalculator.java
+++ b/engine/src/desktop/jme3tools/navigation/NavCalculator.java
@@ -4,9 +4,6 @@
  */
 package jme3tools.navigation;
 
-import jme3tools.navigation.InvalidPositionException;
-import jme3tools.navigation.Position;
-
 
 
 /**
diff --git a/engine/src/desktop/jme3tools/navigation/Position.java b/engine/src/desktop/jme3tools/navigation/Position.java
index b26e4bca1..b55e852e2 100644
--- a/engine/src/desktop/jme3tools/navigation/Position.java
+++ b/engine/src/desktop/jme3tools/navigation/Position.java
@@ -4,8 +4,6 @@
  */
 package jme3tools.navigation;
 
-import jme3tools.navigation.InvalidPositionException;
-
 /**
  * This class represents the position of an entity in the world.
  * 
diff --git a/engine/src/desktop/jme3tools/navigation/StringUtil.java b/engine/src/desktop/jme3tools/navigation/StringUtil.java
index 35765eac7..b59f68f6f 100644
--- a/engine/src/desktop/jme3tools/navigation/StringUtil.java
+++ b/engine/src/desktop/jme3tools/navigation/StringUtil.java
@@ -4,7 +4,7 @@
  */
 package jme3tools.navigation;
 
-import java.util.regex.*;
+import java.util.regex.Pattern;
 
 /**
  * A collection of String utilities.
diff --git a/engine/src/desktop/jme3tools/nvtex/NVCompress.java b/engine/src/desktop/jme3tools/nvtex/NVCompress.java
index 1968f4379..7a1e75763 100644
--- a/engine/src/desktop/jme3tools/nvtex/NVCompress.java
+++ b/engine/src/desktop/jme3tools/nvtex/NVCompress.java
@@ -39,18 +39,12 @@ import com.jme3.system.JmeSystem;
 import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
 import com.jme3.texture.plugins.HDRLoader;
-import jme3tools.converters.ImageToAwt;
-import jme3tools.converters.MipMapGenerator;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
@@ -60,6 +54,8 @@ import javax.swing.DefaultListModel;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+import jme3tools.converters.ImageToAwt;
+import jme3tools.converters.MipMapGenerator;
 
 public class NVCompress extends javax.swing.JFrame {
     
diff --git a/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java b/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java
index bbbca345a..e4dba9cfc 100644
--- a/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java
+++ b/engine/src/jbullet/com/jme3/bullet/PhysicsSpace.java
@@ -35,21 +35,10 @@ import com.bulletphysics.BulletGlobals;
 import com.bulletphysics.ContactAddedCallback;
 import com.bulletphysics.ContactDestroyedCallback;
 import com.bulletphysics.ContactProcessedCallback;
-import com.bulletphysics.collision.broadphase.AxisSweep3;
-import com.bulletphysics.collision.broadphase.AxisSweep3_32;
-import com.bulletphysics.collision.broadphase.BroadphaseInterface;
-import com.bulletphysics.collision.broadphase.BroadphaseProxy;
-import com.bulletphysics.collision.broadphase.CollisionFilterGroups;
-import com.bulletphysics.collision.broadphase.DbvtBroadphase;
-import com.bulletphysics.collision.broadphase.OverlapFilterCallback;
-import com.bulletphysics.collision.broadphase.SimpleBroadphase;
-import com.bulletphysics.collision.dispatch.CollisionDispatcher;
-import com.bulletphysics.collision.dispatch.CollisionObject;
-import com.bulletphysics.collision.dispatch.CollisionWorld;
+import com.bulletphysics.collision.broadphase.*;
 import com.bulletphysics.collision.dispatch.CollisionWorld.LocalConvexResult;
 import com.bulletphysics.collision.dispatch.CollisionWorld.LocalRayResult;
-import com.bulletphysics.collision.dispatch.DefaultCollisionConfiguration;
-import com.bulletphysics.collision.dispatch.GhostPairCallback;
+import com.bulletphysics.collision.dispatch.*;
 import com.bulletphysics.collision.narrowphase.ManifoldPoint;
 import com.bulletphysics.collision.shapes.ConvexShape;
 import com.bulletphysics.dynamics.DiscreteDynamicsWorld;
@@ -61,25 +50,18 @@ import com.bulletphysics.dynamics.constraintsolver.SequentialImpulseConstraintSo
 import com.bulletphysics.extras.gimpact.GImpactCollisionAlgorithm;
 import com.jme3.app.AppTask;
 import com.jme3.asset.AssetManager;
-import com.jme3.math.Vector3f;
-import com.jme3.bullet.collision.PhysicsCollisionEvent;
-import com.jme3.bullet.collision.PhysicsCollisionEventFactory;
-import com.jme3.bullet.collision.PhysicsCollisionGroupListener;
-import com.jme3.bullet.collision.PhysicsCollisionListener;
-import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.bullet.collision.PhysicsRayTestResult;
-import com.jme3.bullet.collision.PhysicsSweepTestResult;
+import com.jme3.bullet.collision.*;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.control.PhysicsControl;
 import com.jme3.bullet.control.RigidBodyControl;
-import com.jme3.bullet.control.VehicleControl;
 import com.jme3.bullet.joints.PhysicsJoint;
-import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsCharacter;
-import com.jme3.bullet.objects.PhysicsVehicle;
+import com.jme3.bullet.objects.PhysicsGhostObject;
 import com.jme3.bullet.objects.PhysicsRigidBody;
+import com.jme3.bullet.objects.PhysicsVehicle;
 import com.jme3.bullet.util.Converter;
 import com.jme3.math.Transform;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import java.util.Iterator;
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionEvent.java b/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionEvent.java
index 28e15347a..4dc768a29 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionEvent.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionEvent.java
@@ -32,8 +32,8 @@
 package com.jme3.bullet.collision;
 
 import com.bulletphysics.collision.narrowphase.ManifoldPoint;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
 import java.util.EventObject;
 
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionObject.java b/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
index 991295cd1..eaeac35e2 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/PhysicsCollisionObject.java
@@ -34,11 +34,7 @@ package com.jme3.bullet.collision;
 import com.jme3.asset.AssetManager;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.DebugShapeFactory;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
index 1dbc370d0..ea3f605a0 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/BoxCollisionShape.java
@@ -32,12 +32,12 @@
 package com.jme3.bullet.collision.shapes;
 
 import com.bulletphysics.collision.shapes.BoxShape;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CollisionShape.java
index 65c44001c..3a36a7514 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CollisionShape.java
@@ -31,13 +31,9 @@
  */
 package com.jme3.bullet.collision.shapes;
 
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
index 976d30d2f..1beb06688 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CompoundCollisionShape.java
@@ -34,13 +34,13 @@ package com.jme3.bullet.collision.shapes;
 import com.bulletphysics.collision.shapes.CompoundShape;
 import com.bulletphysics.linearmath.Transform;
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
+import com.jme3.bullet.util.Converter;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Vector3f;
-import com.jme3.bullet.util.Converter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
index 884d7f0ac..866a4435d 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
@@ -34,12 +34,12 @@ package com.jme3.bullet.collision.shapes;
 import com.bulletphysics.collision.shapes.CylinderShape;
 import com.bulletphysics.collision.shapes.CylinderShapeX;
 import com.bulletphysics.collision.shapes.CylinderShapeZ;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
index ccf688dc8..6d1242015 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/GImpactCollisionShape.java
@@ -34,13 +34,13 @@ package com.jme3.bullet.collision.shapes;
 import com.bulletphysics.collision.shapes.IndexedMesh;
 import com.bulletphysics.collision.shapes.TriangleIndexVertexArray;
 import com.bulletphysics.extras.gimpact.GImpactMeshShape;
+import com.jme3.bullet.util.Converter;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
-import com.jme3.bullet.util.Converter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
index 58d88f83b..1aa4a67d7 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/HullCollisionShape.java
@@ -1,9 +1,5 @@
 package com.jme3.bullet.collision.shapes;
 
-import java.nio.FloatBuffer;
-
-import javax.vecmath.Vector3f;
-
 import com.bulletphysics.collision.shapes.ConvexHullShape;
 import com.bulletphysics.util.ObjectArrayList;
 import com.jme3.bullet.util.Converter;
@@ -14,6 +10,8 @@ import com.jme3.export.OutputCapsule;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
 import java.io.IOException;
+import java.nio.FloatBuffer;
+import javax.vecmath.Vector3f;
 
 public class HullCollisionShape extends CollisionShape {
 
diff --git a/engine/src/jbullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java b/engine/src/jbullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
index 264d253f3..661b8dce3 100644
--- a/engine/src/jbullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
+++ b/engine/src/jbullet/com/jme3/bullet/collision/shapes/MeshCollisionShape.java
@@ -34,13 +34,13 @@ package com.jme3.bullet.collision.shapes;
 import com.bulletphysics.collision.shapes.BvhTriangleMeshShape;
 import com.bulletphysics.collision.shapes.IndexedMesh;
 import com.bulletphysics.collision.shapes.TriangleIndexVertexArray;
+import com.jme3.bullet.util.Converter;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
+import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
-import com.jme3.bullet.util.Converter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/ConeJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/ConeJoint.java
index 243c52e94..2dc54f4ca 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/ConeJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/ConeJoint.java
@@ -33,14 +33,14 @@ package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.ConeTwistConstraint;
 import com.bulletphysics.linearmath.Transform;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/HingeJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/HingeJoint.java
index 27e267eb3..47b025096 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/HingeJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/HingeJoint.java
@@ -32,13 +32,13 @@
 package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.HingeConstraint;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/PhysicsJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/PhysicsJoint.java
index d5c119acb..533078a43 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/PhysicsJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/PhysicsJoint.java
@@ -32,13 +32,9 @@
 package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.TypedConstraint;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/Point2PointJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/Point2PointJoint.java
index 2e93d2b88..a3f768a17 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/Point2PointJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/Point2PointJoint.java
@@ -32,13 +32,13 @@
 package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.Point2PointConstraint;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/SixDofJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/SixDofJoint.java
index 492df5e79..e15376087 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/SixDofJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/SixDofJoint.java
@@ -33,16 +33,16 @@ package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.Generic6DofConstraint;
 import com.bulletphysics.linearmath.Transform;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.joints.motors.RotationalLimitMotor;
 import com.jme3.bullet.joints.motors.TranslationalLimitMotor;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/SliderJoint.java b/engine/src/jbullet/com/jme3/bullet/joints/SliderJoint.java
index c52eefb15..4602018f9 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/SliderJoint.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/SliderJoint.java
@@ -33,14 +33,14 @@ package com.jme3.bullet.joints;
 
 import com.bulletphysics.dynamics.constraintsolver.SliderConstraint;
 import com.bulletphysics.linearmath.Transform;
-import com.jme3.export.JmeExporter;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.objects.PhysicsRigidBody;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java b/engine/src/jbullet/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
index 0be531140..d5c23cb71 100644
--- a/engine/src/jbullet/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
+++ b/engine/src/jbullet/com/jme3/bullet/joints/motors/TranslationalLimitMotor.java
@@ -31,8 +31,8 @@
  */
 package com.jme3.bullet.joints.motors;
 
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
+import com.jme3.math.Vector3f;
 
 /**
  *
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsCharacter.java b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsCharacter.java
index ec56b43ab..932c2e1eb 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsCharacter.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsCharacter.java
@@ -37,7 +37,6 @@ import com.bulletphysics.collision.shapes.ConvexShape;
 import com.bulletphysics.dynamics.character.KinematicCharacterController;
 import com.bulletphysics.linearmath.Transform;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
@@ -46,6 +45,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsGhostObject.java b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsGhostObject.java
index a61b791b6..2f53a825d 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsGhostObject.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsGhostObject.java
@@ -34,9 +34,6 @@ package com.jme3.bullet.objects;
 import com.bulletphysics.collision.dispatch.CollisionFlags;
 import com.bulletphysics.collision.dispatch.PairCachingGhostObject;
 import com.bulletphysics.linearmath.Transform;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Quaternion;
-import com.jme3.scene.Spatial;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.Converter;
@@ -44,7 +41,10 @@ import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Matrix3f;
+import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
+import com.jme3.scene.Spatial;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsRigidBody.java b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsRigidBody.java
index abbb15a0e..77b13b222 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsRigidBody.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsRigidBody.java
@@ -35,8 +35,6 @@ import com.bulletphysics.collision.dispatch.CollisionFlags;
 import com.bulletphysics.dynamics.RigidBody;
 import com.bulletphysics.dynamics.RigidBodyConstructionInfo;
 import com.bulletphysics.linearmath.Transform;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.shapes.CollisionShape;
@@ -50,8 +48,10 @@ import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Matrix3f;
 import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.Arrow;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsVehicle.java b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsVehicle.java
index 8f5ad6fea..eacf53441 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/PhysicsVehicle.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/PhysicsVehicle.java
@@ -32,22 +32,18 @@
 package com.jme3.bullet.objects;
 
 import com.bulletphysics.collision.dispatch.CollisionObject;
-import com.bulletphysics.dynamics.vehicle.DefaultVehicleRaycaster;
-import com.bulletphysics.dynamics.vehicle.RaycastVehicle;
-import com.bulletphysics.dynamics.vehicle.VehicleRaycaster;
-import com.bulletphysics.dynamics.vehicle.VehicleTuning;
-import com.bulletphysics.dynamics.vehicle.WheelInfo;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Spatial;
+import com.bulletphysics.dynamics.vehicle.*;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.util.Converter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeExporter;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.Arrow;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/VehicleWheel.java b/engine/src/jbullet/com/jme3/bullet/objects/VehicleWheel.java
index 458a4f652..598593f23 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/VehicleWheel.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/VehicleWheel.java
@@ -32,16 +32,12 @@
 package com.jme3.bullet.objects;
 
 import com.bulletphysics.dynamics.RigidBody;
+import com.jme3.bullet.collision.PhysicsCollisionObject;
+import com.jme3.bullet.util.Converter;
+import com.jme3.export.*;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
-import com.jme3.bullet.collision.PhysicsCollisionObject;
-import com.jme3.bullet.util.Converter;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
 import java.io.IOException;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/objects/infos/RigidBodyMotionState.java b/engine/src/jbullet/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
index f0d7eb3e6..8dd46bb16 100644
--- a/engine/src/jbullet/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
+++ b/engine/src/jbullet/com/jme3/bullet/objects/infos/RigidBodyMotionState.java
@@ -34,10 +34,10 @@ package com.jme3.bullet.objects.infos;
 import com.bulletphysics.linearmath.MotionState;
 import com.bulletphysics.linearmath.Transform;
 import com.jme3.bullet.objects.PhysicsVehicle;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
 import com.jme3.bullet.util.Converter;
 import com.jme3.math.Matrix3f;
+import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
 
 /**
diff --git a/engine/src/jbullet/com/jme3/bullet/util/Converter.java b/engine/src/jbullet/com/jme3/bullet/util/Converter.java
index d257d09b4..15fb42c42 100644
--- a/engine/src/jbullet/com/jme3/bullet/util/Converter.java
+++ b/engine/src/jbullet/com/jme3/bullet/util/Converter.java
@@ -34,10 +34,9 @@ package com.jme3.bullet.util;
 import com.bulletphysics.collision.shapes.IndexedMesh;
 import com.bulletphysics.dom.HeightfieldTerrainShape;
 import com.jme3.math.FastMath;
-import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer.Type;
-import com.jme3.scene.mesh.WrappedIndexBuffer;
+import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
diff --git a/engine/src/jbullet/com/jme3/bullet/util/DebugShapeFactory.java b/engine/src/jbullet/com/jme3/bullet/util/DebugShapeFactory.java
index 7a51c694e..ff0009ca5 100644
--- a/engine/src/jbullet/com/jme3/bullet/util/DebugShapeFactory.java
+++ b/engine/src/jbullet/com/jme3/bullet/util/DebugShapeFactory.java
@@ -47,8 +47,6 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/engine/src/jogg/com/jme3/audio/plugins/CachedOggStream.java b/engine/src/jogg/com/jme3/audio/plugins/CachedOggStream.java
index b2691b526..9b7c980f7 100644
--- a/engine/src/jogg/com/jme3/audio/plugins/CachedOggStream.java
+++ b/engine/src/jogg/com/jme3/audio/plugins/CachedOggStream.java
@@ -39,8 +39,8 @@ import de.jarnbjo.ogg.OggPage;
 import de.jarnbjo.ogg.PhysicalOggStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/jogg/com/jme3/audio/plugins/OGGLoader.java b/engine/src/jogg/com/jme3/audio/plugins/OGGLoader.java
index fc11f1601..7128a1932 100644
--- a/engine/src/jogg/com/jme3/audio/plugins/OGGLoader.java
+++ b/engine/src/jogg/com/jme3/audio/plugins/OGGLoader.java
@@ -33,11 +33,11 @@
 package com.jme3.audio.plugins;
 
 import com.jme3.asset.AssetInfo;
-import com.jme3.audio.AudioBuffer;
-import com.jme3.audio.AudioStream;
 import com.jme3.asset.AssetLoader;
+import com.jme3.audio.AudioBuffer;
 import com.jme3.audio.AudioData;
 import com.jme3.audio.AudioKey;
+import com.jme3.audio.AudioStream;
 import com.jme3.util.BufferUtils;
 import de.jarnbjo.ogg.EndOfOggStreamException;
 import de.jarnbjo.ogg.LogicalOggStream;
diff --git a/engine/src/jogg/com/jme3/audio/plugins/UncachedOggStream.java b/engine/src/jogg/com/jme3/audio/plugins/UncachedOggStream.java
index 44eb751bb..de81af9f5 100644
--- a/engine/src/jogg/com/jme3/audio/plugins/UncachedOggStream.java
+++ b/engine/src/jogg/com/jme3/audio/plugins/UncachedOggStream.java
@@ -32,11 +32,7 @@
 
 package com.jme3.audio.plugins;
 
-import de.jarnbjo.ogg.LogicalOggStream;
-import de.jarnbjo.ogg.LogicalOggStreamImpl;
-import de.jarnbjo.ogg.OggFormatException;
-import de.jarnbjo.ogg.OggPage;
-import de.jarnbjo.ogg.PhysicalOggStream;
+import de.jarnbjo.ogg.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
diff --git a/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java b/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java
index bb8e0d719..2570b6af7 100644
--- a/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java
+++ b/engine/src/lwjgl/com/jme3/audio/lwjgl/LwjglAudioRenderer.java
@@ -32,18 +32,8 @@
 
 package com.jme3.audio.lwjgl;
 
-import com.jme3.audio.ListenerParam;
-import com.jme3.audio.AudioParam;
-import com.jme3.audio.AudioBuffer;
-import com.jme3.audio.AudioData;
-import com.jme3.audio.AudioRenderer;
-import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode.Status;
-import com.jme3.audio.AudioStream;
-import com.jme3.audio.Environment;
-import com.jme3.audio.Filter;
-import com.jme3.audio.Listener;
-import com.jme3.audio.LowPassFilter;
+import com.jme3.audio.*;
 import com.jme3.math.Vector3f;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.NativeObjectManager;
@@ -55,15 +45,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.lwjgl.LWJGLException;
-import org.lwjgl.openal.AL;
-
-import org.lwjgl.openal.AL11;
-import org.lwjgl.openal.ALC10;
-import org.lwjgl.openal.ALCdevice;
-import org.lwjgl.openal.EFX10;
-import org.lwjgl.openal.OpenALException;
-
 import static org.lwjgl.openal.AL10.*;
+import org.lwjgl.openal.*;
 
 public class LwjglAudioRenderer implements AudioRenderer, Runnable {
 
diff --git a/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java b/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
index b754e15ed..033f2367d 100644
--- a/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
+++ b/engine/src/lwjgl/com/jme3/input/lwjgl/JInputJoyInput.java
@@ -8,16 +8,11 @@ import com.jme3.input.event.JoyAxisEvent;
 import com.jme3.input.event.JoyButtonEvent;
 import com.jme3.util.IntMap;
 import java.util.HashMap;
-import net.java.games.input.Component;
 import net.java.games.input.Component.Identifier;
 import net.java.games.input.Component.Identifier.Axis;
 import net.java.games.input.Component.Identifier.Button;
 import net.java.games.input.Component.POV;
-import net.java.games.input.Controller;
-import net.java.games.input.ControllerEnvironment;
-import net.java.games.input.Event;
-import net.java.games.input.EventQueue;
-import net.java.games.input.Rumbler;
+import net.java.games.input.*;
 
 public class JInputJoyInput implements JoyInput {
 
diff --git a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglKeyInput.java b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglKeyInput.java
index 99c8046e6..1e31e6065 100644
--- a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglKeyInput.java
+++ b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglKeyInput.java
@@ -33,8 +33,8 @@
 package com.jme3.input.lwjgl;
 
 import com.jme3.input.KeyInput;
-import com.jme3.input.event.KeyInputEvent;
 import com.jme3.input.RawInputListener;
+import com.jme3.input.event.KeyInputEvent;
 import com.jme3.system.lwjgl.LwjglAbstractDisplay;
 import com.jme3.system.lwjgl.LwjglTimer;
 import java.util.logging.Level;
diff --git a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java
index 843c7883c..2e45d9406 100644
--- a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java
+++ b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java
@@ -32,10 +32,10 @@
 
 package com.jme3.input.lwjgl;
 
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
 import com.jme3.input.MouseInput;
 import com.jme3.input.RawInputListener;
+import com.jme3.input.event.MouseButtonEvent;
+import com.jme3.input.event.MouseMotionEvent;
 import com.jme3.system.lwjgl.LwjglAbstractDisplay;
 import com.jme3.system.lwjgl.LwjglTimer;
 import java.util.logging.Level;
diff --git a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
index e8c572f04..ec41e0c8a 100644
--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
@@ -1,51 +1,42 @@
 package com.jme3.renderer.lwjgl;
 
-import com.jme3.light.SpotLight;
-import java.util.ArrayList;
-import com.jme3.light.PointLight;
-import com.jme3.math.Vector3f;
-import com.jme3.light.DirectionalLight;
-import com.jme3.light.Light;
-import org.lwjgl.opengl.GL14;
+import com.jme3.light.*;
+import com.jme3.material.FixedFuncBinding;
+import com.jme3.material.RenderState;
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
+import com.jme3.math.Matrix4f;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.Caps;
 import com.jme3.renderer.GL1Renderer;
+import com.jme3.renderer.RenderContext;
+import com.jme3.renderer.Statistics;
+import com.jme3.scene.Mesh;
+import com.jme3.scene.Mesh.Mode;
+import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.shader.Shader;
 import com.jme3.shader.Shader.ShaderSource;
 import com.jme3.texture.FrameBuffer;
-import java.nio.ShortBuffer;
-import java.nio.Buffer;
-import com.jme3.scene.Mesh.Mode;
-import com.jme3.scene.VertexBuffer.Usage;
-import com.jme3.scene.VertexBuffer.Type;
-import com.jme3.util.IntMap.Entry;
-import com.jme3.util.IntMap;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.VertexBuffer;
 import com.jme3.texture.Image;
-import com.jme3.texture.Texture.WrapAxis;
 import com.jme3.texture.Texture;
-import com.jme3.light.LightList;
-import com.jme3.material.FixedFuncBinding;
-import java.nio.FloatBuffer;
-import com.jme3.math.Matrix4f;
-import java.util.logging.Level;
-import com.jme3.material.RenderState;
-import com.jme3.math.ColorRGBA;
-import com.jme3.renderer.Caps;
-import com.jme3.util.NativeObjectManager;
-import com.jme3.renderer.RenderContext;
-import com.jme3.renderer.Statistics;
+import com.jme3.texture.Texture.WrapAxis;
 import com.jme3.util.BufferUtils;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
+import com.jme3.util.IntMap;
+import com.jme3.util.IntMap.Entry;
+import com.jme3.util.NativeObjectManager;
+import java.nio.*;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import jme3tools.converters.MipMapGenerator;
+import static org.lwjgl.opengl.GL11.*;
 import org.lwjgl.opengl.GL12;
+import org.lwjgl.opengl.GL14;
 import org.lwjgl.opengl.GLContext;
 
-import static org.lwjgl.opengl.GL11.*;
-
 public class LwjglGL1Renderer implements GL1Renderer {
 
     private static final Logger logger = Logger.getLogger(LwjglRenderer.class.getName());
diff --git a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
index bb7866f5f..b297e7eae 100644
--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
@@ -35,26 +35,14 @@ import com.jme3.light.LightList;
 import com.jme3.material.RenderState;
 import com.jme3.material.RenderState.StencilOperation;
 import com.jme3.material.RenderState.TestFunction;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-import com.jme3.math.Vector4f;
-import com.jme3.renderer.Caps;
-import com.jme3.util.NativeObjectManager;
-import com.jme3.renderer.IDList;
-import com.jme3.renderer.Renderer;
+import com.jme3.math.*;
+import com.jme3.renderer.*;
 import com.jme3.scene.Mesh;
+import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
-import com.jme3.renderer.RenderContext;
-import com.jme3.renderer.RendererException;
-import com.jme3.renderer.Statistics;
-import com.jme3.scene.Mesh.Mode;
 import com.jme3.shader.Attribute;
 import com.jme3.shader.Shader;
 import com.jme3.shader.Shader.ShaderSource;
@@ -69,50 +57,25 @@ import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import com.jme3.util.ListMap;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import com.jme3.util.NativeObjectManager;
+import java.nio.*;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
-//import org.lwjgl.opengl.ARBGeometryShader4;
-//import org.lwjgl.opengl.ARBHalfFloatVertex;
-//import org.lwjgl.opengl.ARBVertexArrayObject;
-//import org.lwjgl.opengl.ARBHalfFloatVertex;
-//import org.lwjgl.opengl.ARBVertexArrayObject;
-//import jme3tools.converters.MipMapGenerator;
 import jme3tools.converters.MipMapGenerator;
-import org.lwjgl.opengl.ARBDrawBuffers;
-//import org.lwjgl.opengl.ARBDrawInstanced;
-import org.lwjgl.opengl.ARBDrawInstanced;
-import org.lwjgl.opengl.ARBFramebufferObject;
-import org.lwjgl.opengl.ARBMultisample;
-import org.lwjgl.opengl.ContextCapabilities;
-import org.lwjgl.opengl.EXTTextureArray;
-import org.lwjgl.opengl.EXTTextureFilterAnisotropic;
-import org.lwjgl.opengl.GLContext;
-import org.lwjgl.opengl.NVHalfFloat;
-
+import static org.lwjgl.opengl.ARBTextureMultisample.*;
+import static org.lwjgl.opengl.EXTFramebufferBlit.*;
+import static org.lwjgl.opengl.EXTFramebufferMultisample.*;
+import static org.lwjgl.opengl.EXTFramebufferObject.*;
 import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL12.*;
 import static org.lwjgl.opengl.GL13.*;
 import static org.lwjgl.opengl.GL14.*;
 import static org.lwjgl.opengl.GL15.*;
 import static org.lwjgl.opengl.GL20.*;
-
-import static org.lwjgl.opengl.EXTFramebufferObject.*;
-import static org.lwjgl.opengl.EXTFramebufferMultisample.*;
-import static org.lwjgl.opengl.ARBTextureMultisample.*;
-import static org.lwjgl.opengl.EXTFramebufferBlit.*;
-import org.lwjgl.opengl.ARBShaderObjects.*;
-import org.lwjgl.opengl.ARBTextureMultisample;
-import org.lwjgl.opengl.ARBVertexArrayObject;
-import org.lwjgl.opengl.GL30;
+import org.lwjgl.opengl.*;
 //import static org.lwjgl.opengl.ARBDrawInstanced.*;
 
 public class LwjglRenderer implements Renderer {
diff --git a/engine/src/lwjgl/com/jme3/renderer/lwjgl/TextureUtil.java b/engine/src/lwjgl/com/jme3/renderer/lwjgl/TextureUtil.java
index dc5dbae38..2edeea4bb 100644
--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/TextureUtil.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/TextureUtil.java
@@ -32,28 +32,20 @@
 
 package com.jme3.renderer.lwjgl;
 
-import org.lwjgl.opengl.GLContext;
 import com.jme3.renderer.RendererException;
-import org.lwjgl.opengl.EXTAbgr;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
 import java.nio.ByteBuffer;
-import org.lwjgl.opengl.ARBDepthBufferFloat;
-import org.lwjgl.opengl.ARBHalfFloatPixel;
-import org.lwjgl.opengl.ARBTextureFloat;
-import org.lwjgl.opengl.ARBTextureMultisample;
-import org.lwjgl.opengl.ContextCapabilities;
-import org.lwjgl.opengl.EXTPackedFloat;
-import org.lwjgl.opengl.EXTTextureArray;
-import org.lwjgl.opengl.EXTTextureSharedExponent;
-import org.lwjgl.opengl.NVDepthBufferFloat;
+import static org.lwjgl.opengl.ATITextureCompression3DC.GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI;
+import static org.lwjgl.opengl.EXTTextureCompressionLATC.GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;
+import static org.lwjgl.opengl.EXTTextureCompressionLATC.GL_COMPRESSED_LUMINANCE_LATC1_EXT;
 import static org.lwjgl.opengl.EXTTextureCompressionS3TC.*;
-import static org.lwjgl.opengl.EXTTextureCompressionLATC.*;
-import static org.lwjgl.opengl.ATITextureCompression3DC.*;
 import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL12.*;
-import static org.lwjgl.opengl.GL13.*;
+import static org.lwjgl.opengl.GL13.glCompressedTexImage2D;
+import static org.lwjgl.opengl.GL13.glCompressedTexImage3D;
 import static org.lwjgl.opengl.GL14.*;
+import org.lwjgl.opengl.*;
 
 public class TextureUtil {
 
diff --git a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglContext.java b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglContext.java
index 3c9ed5169..91b369494 100644
--- a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglContext.java
+++ b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglContext.java
@@ -39,18 +39,13 @@ import com.jme3.renderer.Renderer;
 import com.jme3.renderer.lwjgl.LwjglGL1Renderer;
 import com.jme3.renderer.lwjgl.LwjglRenderer;
 import com.jme3.system.AppSettings;
-import com.jme3.system.SystemListener;
 import com.jme3.system.JmeContext;
-import com.jme3.system.NullRenderer;
+import com.jme3.system.SystemListener;
 import com.jme3.system.Timer;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.lwjgl.opengl.ContextAttribs;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL20;
-import org.lwjgl.opengl.GLContext;
+import org.lwjgl.opengl.*;
 
 /**
  * A LWJGL implementation of a graphics context.
diff --git a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglDisplay.java b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglDisplay.java
index 681ba7cde..652a8dc36 100644
--- a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglDisplay.java
+++ b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglDisplay.java
@@ -32,23 +32,16 @@
 
 package com.jme3.system.lwjgl;
 
-import com.jme3.system.JmeContext.Type;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
 import com.jme3.system.AppSettings;
-
+import com.jme3.system.JmeContext.Type;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.lwjgl.opengl.ARBMultisample;
-import org.lwjgl.opengl.ContextAttribs;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GLContext;
-import org.lwjgl.opengl.PixelFormat;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.*;
 
 public class LwjglDisplay extends LwjglAbstractDisplay {
 
diff --git a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java
index 43095fd74..2c5a384a1 100644
--- a/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java
+++ b/engine/src/lwjgl/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java
@@ -43,11 +43,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.Sys;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.OpenGLException;
-import org.lwjgl.opengl.Pbuffer;
-import org.lwjgl.opengl.PixelFormat;
-import org.lwjgl.opengl.Util;
+import org.lwjgl.opengl.*;
 
 public class LwjglOffscreenBuffer extends LwjglContext implements Runnable {
 
diff --git a/engine/src/networking/com/jme3/network/Filters.java b/engine/src/networking/com/jme3/network/Filters.java
index d50929174..70c64206e 100644
--- a/engine/src/networking/com/jme3/network/Filters.java
+++ b/engine/src/networking/com/jme3/network/Filters.java
@@ -32,7 +32,9 @@
 
 package com.jme3.network;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
 
 /**
  *  Static utility methods pertaining to Filter instances.
diff --git a/engine/src/networking/com/jme3/network/Network.java b/engine/src/networking/com/jme3/network/Network.java
index c7843df26..c32d38124 100644
--- a/engine/src/networking/com/jme3/network/Network.java
+++ b/engine/src/networking/com/jme3/network/Network.java
@@ -32,15 +32,14 @@
 
 package com.jme3.network;
 
-import java.io.IOException;
-import java.net.InetAddress;
-
 import com.jme3.network.base.DefaultClient;
 import com.jme3.network.base.DefaultServer;
 import com.jme3.network.kernel.tcp.SelectorKernel;
 import com.jme3.network.kernel.tcp.SocketConnector;
 import com.jme3.network.kernel.udp.UdpConnector;
 import com.jme3.network.kernel.udp.UdpKernel;
+import java.io.IOException;
+import java.net.InetAddress;
 
 /**
  *  The main service provider for conveniently creating
diff --git a/engine/src/networking/com/jme3/network/base/ConnectorAdapter.java b/engine/src/networking/com/jme3/network/base/ConnectorAdapter.java
index 1a39c7109..2d813bef4 100644
--- a/engine/src/networking/com/jme3/network/base/ConnectorAdapter.java
+++ b/engine/src/networking/com/jme3/network/base/ConnectorAdapter.java
@@ -32,16 +32,15 @@
 
 package com.jme3.network.base;
 
-import java.nio.ByteBuffer;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.jme3.network.ErrorListener;
 import com.jme3.network.Message;
 import com.jme3.network.MessageListener;
 import com.jme3.network.kernel.Connector;
 import com.jme3.network.kernel.ConnectorException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  *  Wraps a single Connector and forwards new messages
diff --git a/engine/src/networking/com/jme3/network/base/DefaultClient.java b/engine/src/networking/com/jme3/network/base/DefaultClient.java
index 4a237e904..bff2df285 100644
--- a/engine/src/networking/com/jme3/network/base/DefaultClient.java
+++ b/engine/src/networking/com/jme3/network/base/DefaultClient.java
@@ -32,20 +32,18 @@
 
 package com.jme3.network.base;
 
-import java.io.IOException;
+import com.jme3.network.ClientStateListener.DisconnectInfo;
+import com.jme3.network.*;
+import com.jme3.network.kernel.Connector;
+import com.jme3.network.message.ClientRegistrationMessage;
+import com.jme3.network.message.DisconnectMessage;
 import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.network.*;
-import com.jme3.network.ClientStateListener.DisconnectInfo;
-import com.jme3.network.message.ClientRegistrationMessage; //hopefully temporary
-import com.jme3.network.message.DisconnectMessage; //hopefully temporary
-import com.jme3.network.kernel.Connector;
-import com.jme3.network.serializing.Serializer;
-
 /**
  *  A default implementation of the Client interface that delegates
  *  its network connectivity to a kernel.Connector.
diff --git a/engine/src/networking/com/jme3/network/base/DefaultServer.java b/engine/src/networking/com/jme3/network/base/DefaultServer.java
index a669ff326..2b0a7ec98 100644
--- a/engine/src/networking/com/jme3/network/base/DefaultServer.java
+++ b/engine/src/networking/com/jme3/network/base/DefaultServer.java
@@ -32,20 +32,19 @@
 
 package com.jme3.network.base;
 
-import java.io.IOException;
+import com.jme3.network.*;
+import com.jme3.network.kernel.Endpoint;
+import com.jme3.network.kernel.Kernel;
+import com.jme3.network.message.ClientRegistrationMessage;
+import com.jme3.network.message.DisconnectMessage;
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.network.*;
-import com.jme3.network.kernel.*;
-import com.jme3.network.message.ClientRegistrationMessage; //hopefully temporary
-import com.jme3.network.message.DisconnectMessage; //hopefully temporary 
-import com.jme3.network.serializing.Serializer;
-
 /**
  *  A default implementation of the Server interface that delegates
  *  its network connectivity to kernel.Kernel.
diff --git a/engine/src/networking/com/jme3/network/base/KernelAdapter.java b/engine/src/networking/com/jme3/network/base/KernelAdapter.java
index 23275d38c..d966425fe 100644
--- a/engine/src/networking/com/jme3/network/base/KernelAdapter.java
+++ b/engine/src/networking/com/jme3/network/base/KernelAdapter.java
@@ -32,22 +32,21 @@
 
 package com.jme3.network.base;
 
-import java.io.IOException;
+import com.jme3.network.HostedConnection;
+import com.jme3.network.Message;
+import com.jme3.network.MessageListener;
+import com.jme3.network.kernel.Endpoint;
+import com.jme3.network.kernel.EndpointEvent;
+import com.jme3.network.kernel.Envelope;
+import com.jme3.network.kernel.Kernel;
+import com.jme3.network.message.ClientRegistrationMessage;
 import java.nio.ByteBuffer;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.network.*;
-import com.jme3.network.kernel.Endpoint;
-import com.jme3.network.kernel.EndpointEvent;
-import com.jme3.network.kernel.Envelope;
-import com.jme3.network.kernel.Kernel;
-import com.jme3.network.message.ClientRegistrationMessage; //hopefully temporary
-import com.jme3.network.serializing.Serializer;
-
 /**
  *  Wraps a single Kernel and forwards new messages
  *  to the supplied message dispatcher and new endpoint
diff --git a/engine/src/networking/com/jme3/network/base/MessageListenerRegistry.java b/engine/src/networking/com/jme3/network/base/MessageListenerRegistry.java
index 7234e2083..f99342f83 100644
--- a/engine/src/networking/com/jme3/network/base/MessageListenerRegistry.java
+++ b/engine/src/networking/com/jme3/network/base/MessageListenerRegistry.java
@@ -32,13 +32,15 @@
 
 package com.jme3.network.base;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.network.Message;
 import com.jme3.network.MessageListener;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *  Keeps track of message listeners registered to specific
diff --git a/engine/src/networking/com/jme3/network/base/MessageProtocol.java b/engine/src/networking/com/jme3/network/base/MessageProtocol.java
index b42d4746f..5865fcecb 100644
--- a/engine/src/networking/com/jme3/network/base/MessageProtocol.java
+++ b/engine/src/networking/com/jme3/network/base/MessageProtocol.java
@@ -32,12 +32,11 @@
 
 package com.jme3.network.base;
 
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.*;
-
 import com.jme3.network.Message;
 import com.jme3.network.serializing.Serializer;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
 
 /**
  *  Consolidates the conversion of messages to/from byte buffers
diff --git a/engine/src/networking/com/jme3/network/kernel/AbstractKernel.java b/engine/src/networking/com/jme3/network/kernel/AbstractKernel.java
index c1010f584..07e8609a6 100644
--- a/engine/src/networking/com/jme3/network/kernel/AbstractKernel.java
+++ b/engine/src/networking/com/jme3/network/kernel/AbstractKernel.java
@@ -32,7 +32,6 @@
 
 package com.jme3.network.kernel;
 
-import java.util.Collection;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/engine/src/networking/com/jme3/network/kernel/Envelope.java b/engine/src/networking/com/jme3/network/kernel/Envelope.java
index 6546b7a62..a091b09f2 100644
--- a/engine/src/networking/com/jme3/network/kernel/Envelope.java
+++ b/engine/src/networking/com/jme3/network/kernel/Envelope.java
@@ -32,8 +32,6 @@
 
 package com.jme3.network.kernel;
 
-import java.nio.ByteBuffer;
-
 /**
  *  Encapsulates a received piece of data.  This is used by the Kernel
  *  to track incoming chunks of data.  
diff --git a/engine/src/networking/com/jme3/network/kernel/Kernel.java b/engine/src/networking/com/jme3/network/kernel/Kernel.java
index 5e456dca0..37d514c7b 100644
--- a/engine/src/networking/com/jme3/network/kernel/Kernel.java
+++ b/engine/src/networking/com/jme3/network/kernel/Kernel.java
@@ -32,10 +32,8 @@
 
 package com.jme3.network.kernel;
 
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
 import com.jme3.network.Filter;
+import java.nio.ByteBuffer;
 
 /**
  *  Defines the basic byte[] passing messaging
diff --git a/engine/src/networking/com/jme3/network/kernel/tcp/NioEndpoint.java b/engine/src/networking/com/jme3/network/kernel/tcp/NioEndpoint.java
index ea0c2b4c7..8b8056d7a 100644
--- a/engine/src/networking/com/jme3/network/kernel/tcp/NioEndpoint.java
+++ b/engine/src/networking/com/jme3/network/kernel/tcp/NioEndpoint.java
@@ -32,13 +32,14 @@
 
 package com.jme3.network.kernel.tcp;
 
+import com.jme3.network.kernel.Endpoint;
+import com.jme3.network.kernel.Kernel;
+import com.jme3.network.kernel.KernelException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import com.jme3.network.kernel.*;
-
 
 /**
  *  Endpoint implementation that encapsulates the
diff --git a/engine/src/networking/com/jme3/network/kernel/tcp/SelectorKernel.java b/engine/src/networking/com/jme3/network/kernel/tcp/SelectorKernel.java
index cd1161c53..5fe3c006a 100644
--- a/engine/src/networking/com/jme3/network/kernel/tcp/SelectorKernel.java
+++ b/engine/src/networking/com/jme3/network/kernel/tcp/SelectorKernel.java
@@ -32,22 +32,22 @@
 
 package com.jme3.network.kernel.tcp;
 
+import com.jme3.network.Filter;
+import com.jme3.network.kernel.*;
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.nio.channels.spi.SelectorProvider;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.network.Filter;
-import com.jme3.network.kernel.*;
-
 
 /**
  *  A Kernel implementation based on NIO selectors.
diff --git a/engine/src/networking/com/jme3/network/kernel/tcp/SocketConnector.java b/engine/src/networking/com/jme3/network/kernel/tcp/SocketConnector.java
index 36e69f2e3..997f42918 100644
--- a/engine/src/networking/com/jme3/network/kernel/tcp/SocketConnector.java
+++ b/engine/src/networking/com/jme3/network/kernel/tcp/SocketConnector.java
@@ -32,13 +32,17 @@
 
 package com.jme3.network.kernel.tcp;
 
-import java.io.*;
-import java.net.*;
+import com.jme3.network.kernel.Connector;
+import com.jme3.network.kernel.ConnectorException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.jme3.network.kernel.*;
-
 
 /**
  *  A straight forward socket-based connector implementation that
diff --git a/engine/src/networking/com/jme3/network/kernel/udp/UdpConnector.java b/engine/src/networking/com/jme3/network/kernel/udp/UdpConnector.java
index 951f83a02..f7d96bd1b 100644
--- a/engine/src/networking/com/jme3/network/kernel/udp/UdpConnector.java
+++ b/engine/src/networking/com/jme3/network/kernel/udp/UdpConnector.java
@@ -32,13 +32,13 @@
 
 package com.jme3.network.kernel.udp;
 
-import java.io.*;
+import com.jme3.network.kernel.Connector;
+import com.jme3.network.kernel.ConnectorException;
+import java.io.IOException;
 import java.net.*;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.jme3.network.kernel.*;
-
 
 /**
  *  A straight forward datagram socket-based UDP connector 
diff --git a/engine/src/networking/com/jme3/network/kernel/udp/UdpEndpoint.java b/engine/src/networking/com/jme3/network/kernel/udp/UdpEndpoint.java
index 5b44c4d09..f8eb277ed 100644
--- a/engine/src/networking/com/jme3/network/kernel/udp/UdpEndpoint.java
+++ b/engine/src/networking/com/jme3/network/kernel/udp/UdpEndpoint.java
@@ -32,12 +32,15 @@
 
 package com.jme3.network.kernel.udp;
 
+import com.jme3.network.kernel.Endpoint;
+import com.jme3.network.kernel.Kernel;
+import com.jme3.network.kernel.KernelException;
 import java.io.IOException;
-import java.net.*;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 
-import com.jme3.network.kernel.*;
-
 
 /**
  *  Endpoint implementation that encapsulates the
diff --git a/engine/src/networking/com/jme3/network/kernel/udp/UdpKernel.java b/engine/src/networking/com/jme3/network/kernel/udp/UdpKernel.java
index c13f8d5ed..54ad4140d 100644
--- a/engine/src/networking/com/jme3/network/kernel/udp/UdpKernel.java
+++ b/engine/src/networking/com/jme3/network/kernel/udp/UdpKernel.java
@@ -32,20 +32,19 @@
 
 package com.jme3.network.kernel.udp;
 
+import com.jme3.network.Filter;
+import com.jme3.network.kernel.*;
 import java.io.IOException;
 import java.net.*;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.jme3.network.Filter;
-import com.jme3.network.kernel.*;
-
 /**
  *  A Kernel implementation using UDP packets.
  *
diff --git a/engine/src/networking/com/jme3/network/rmi/ObjectStore.java b/engine/src/networking/com/jme3/network/rmi/ObjectStore.java
index 596201a25..137320ddb 100644
--- a/engine/src/networking/com/jme3/network/rmi/ObjectStore.java
+++ b/engine/src/networking/com/jme3/network/rmi/ObjectStore.java
@@ -32,14 +32,8 @@
 
 package com.jme3.network.rmi;
 
-import com.jme3.network.Client;
-import com.jme3.network.ClientStateListener;
 import com.jme3.network.ClientStateListener.DisconnectInfo;
-import com.jme3.network.ConnectionListener;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.Message;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializer;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
diff --git a/engine/src/networking/com/jme3/network/serializing/Serializer.java b/engine/src/networking/com/jme3/network/serializing/Serializer.java
index e11eaf9e6..11773b737 100644
--- a/engine/src/networking/com/jme3/network/serializing/Serializer.java
+++ b/engine/src/networking/com/jme3/network/serializing/Serializer.java
@@ -33,7 +33,10 @@
 package com.jme3.network.serializing;
 
 import com.jme3.math.Vector3f;
-import com.jme3.network.message.*;
+import com.jme3.network.message.ClientRegistrationMessage;
+import com.jme3.network.message.DisconnectMessage;
+import com.jme3.network.message.GZIPCompressedMessage;
+import com.jme3.network.message.ZIPCompressedMessage;
 import com.jme3.network.serializing.serializers.*;
 import java.beans.beancontext.BeanContextServicesSupport;
 import java.beans.beancontext.BeanContextSupport;
diff --git a/engine/src/networking/com/jme3/network/serializing/serializers/GZIPSerializer.java b/engine/src/networking/com/jme3/network/serializing/serializers/GZIPSerializer.java
index ed56b4bfa..b681511cc 100644
--- a/engine/src/networking/com/jme3/network/serializing/serializers/GZIPSerializer.java
+++ b/engine/src/networking/com/jme3/network/serializing/serializers/GZIPSerializer.java
@@ -32,8 +32,8 @@
 
 package com.jme3.network.serializing.serializers;
 
-import com.jme3.network.message.GZIPCompressedMessage;
 import com.jme3.network.Message;
+import com.jme3.network.message.GZIPCompressedMessage;
 import com.jme3.network.serializing.Serializer;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
index e62e8b322..f8a8c8656 100644
--- a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
+++ b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
@@ -35,14 +35,7 @@ package com.jme3.niftygui;
 import com.jme3.input.InputManager;
 import com.jme3.input.KeyInput;
 import com.jme3.input.RawInputListener;
-import com.jme3.input.event.InputEvent;
-import com.jme3.input.event.JoyAxisEvent;
-import com.jme3.input.event.JoyButtonEvent;
-import com.jme3.input.event.KeyInputEvent;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-import com.jme3.input.event.TouchEvent;
-
+import com.jme3.input.event.*;
 import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.NiftyInputConsumer;
 import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
diff --git a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
index ac9cb16d6..0f0aa7162 100644
--- a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
+++ b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
@@ -49,7 +49,10 @@ import com.jme3.texture.Texture2D;
 import com.jme3.util.BufferUtils;
 import de.lessvoid.nifty.elements.render.TextRenderer.RenderFontNull;
 import de.lessvoid.nifty.render.BlendMode;
-import de.lessvoid.nifty.spi.render.*;
+import de.lessvoid.nifty.spi.render.MouseCursor;
+import de.lessvoid.nifty.spi.render.RenderDevice;
+import de.lessvoid.nifty.spi.render.RenderFont;
+import de.lessvoid.nifty.spi.render.RenderImage;
 import de.lessvoid.nifty.tools.Color;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
diff --git a/engine/src/ogre/com/jme3/scene/plugins/ogre/MaterialLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/MaterialLoader.java
index aeb8eca8a..bf9744b91 100644
--- a/engine/src/ogre/com/jme3/scene/plugins/ogre/MaterialLoader.java
+++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/MaterialLoader.java
@@ -32,12 +32,7 @@
 
 package com.jme3.scene.plugins.ogre;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialList;
 import com.jme3.material.RenderState;
diff --git a/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshLoader.java
index 731cf1412..1a6c82c0c 100644
--- a/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshLoader.java
+++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshLoader.java
@@ -31,55 +31,40 @@
  */
 package com.jme3.scene.plugins.ogre;
 
-import com.jme3.animation.Animation;
-import com.jme3.scene.plugins.ogre.matext.OgreMaterialKey;
 import com.jme3.animation.AnimControl;
+import com.jme3.animation.Animation;
 import com.jme3.animation.SkeletonControl;
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
+import com.jme3.asset.*;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialList;
 import com.jme3.math.ColorRGBA;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.UserData;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
+import com.jme3.scene.plugins.ogre.matext.OgreMaterialKey;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import com.jme3.util.PlaceholderAssets;
+import static com.jme3.util.xml.SAXUtil.*;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-import static com.jme3.util.xml.SAXUtil.*;
-
 /**
  * Loads Ogre3D mesh.xml files.
  */
diff --git a/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java
index d0cb62dca..b59275e45 100644
--- a/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java
+++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java
@@ -32,39 +32,32 @@
 
 package com.jme3.scene.plugins.ogre;
 
-import com.jme3.asset.AssetKey;
-import com.jme3.scene.plugins.ogre.matext.OgreMaterialKey;
-import com.jme3.material.MaterialList;
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.AssetNotFoundException;
+import com.jme3.asset.*;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.Light;
 import com.jme3.light.PointLight;
 import com.jme3.light.SpotLight;
+import com.jme3.material.MaterialList;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.plugins.ogre.matext.OgreMaterialKey;
 import com.jme3.util.PlaceholderAssets;
 import com.jme3.util.xml.SAXUtil;
+import static com.jme3.util.xml.SAXUtil.*;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Stack;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-import static com.jme3.util.xml.SAXUtil.*;
-
 public class SceneLoader extends DefaultHandler implements AssetLoader {
 
     private static final Logger logger = Logger.getLogger(SceneLoader.class.getName());
diff --git a/engine/src/ogre/com/jme3/scene/plugins/ogre/SkeletonLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/SkeletonLoader.java
index 69c62e004..c96a7b783 100644
--- a/engine/src/ogre/com/jme3/scene/plugins/ogre/SkeletonLoader.java
+++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/SkeletonLoader.java
@@ -31,6 +31,16 @@
  */
 package com.jme3.scene.plugins.ogre;
 
+import com.jme3.animation.Animation;
+import com.jme3.animation.Bone;
+import com.jme3.animation.BoneTrack;
+import com.jme3.animation.Skeleton;
+import com.jme3.asset.AssetInfo;
+import com.jme3.asset.AssetLoader;
+import com.jme3.asset.AssetManager;
+import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
+import com.jme3.util.xml.SAXUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -39,27 +49,14 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 import java.util.logging.Logger;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-import com.jme3.animation.Animation;
-import com.jme3.animation.Bone;
-import com.jme3.animation.BoneTrack;
-import com.jme3.animation.Skeleton;
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetLoader;
-import com.jme3.asset.AssetManager;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
-import com.jme3.util.xml.SAXUtil;
-
 public class SkeletonLoader extends DefaultHandler implements AssetLoader {
 
     private static final Logger logger = Logger.getLogger(SceneLoader.class.getName());
diff --git a/engine/src/terrain/com/jme3/terrain/GeoMap.java b/engine/src/terrain/com/jme3/terrain/GeoMap.java
index 1b3cfc5c8..dc9264ff3 100644
--- a/engine/src/terrain/com/jme3/terrain/GeoMap.java
+++ b/engine/src/terrain/com/jme3/terrain/GeoMap.java
@@ -31,11 +31,7 @@
  */
 package com.jme3.terrain;
 
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
-import com.jme3.export.Savable;
+import com.jme3.export.*;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
diff --git a/engine/src/terrain/com/jme3/terrain/MapUtils.java b/engine/src/terrain/com/jme3/terrain/MapUtils.java
index 676f83d05..df5804357 100644
--- a/engine/src/terrain/com/jme3/terrain/MapUtils.java
+++ b/engine/src/terrain/com/jme3/terrain/MapUtils.java
@@ -6,9 +6,7 @@ import java.io.IOException;
 import java.nio.FloatBuffer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.imageio.ImageIO;
-
 import org.novyon.noise.ShaderUtils;
 
 public class MapUtils {
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java b/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
index b0077ce18..4a528fe37 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
@@ -31,24 +31,23 @@
  */
 package com.jme3.terrain.geomipmap;
 
-import com.jme3.terrain.GeoMap;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.math.FastMath;
 import com.jme3.math.Triangle;
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
 import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.terrain.GeoMap;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.TempVars;
 import java.io.IOException;
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 /**
  * Produces the mesh for the TerrainPatch.
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java
index ea6dee757..f50aabfd6 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainGrid.java
@@ -32,32 +32,27 @@
 package com.jme3.terrain.geomipmap;
 
 import com.jme3.bounding.BoundingBox;
+import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
-import com.jme3.scene.control.UpdateControl;
-//import com.jme3.bullet.PhysicsSpace;
-//import com.jme3.bullet.control.RigidBodyControl;
-import com.jme3.export.InputCapsule;
 import com.jme3.export.OutputCapsule;
-import com.jme3.terrain.heightmap.HeightMap;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.control.UpdateControl;
 import com.jme3.terrain.Terrain;
 import com.jme3.terrain.geomipmap.lodcalc.LodCalculator;
+import com.jme3.terrain.heightmap.HeightMap;
 import com.jme3.terrain.heightmap.HeightMapGrid;
+import java.io.IOException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * TerrainGrid itself is an actual TerrainQuad. Its four children are the visible four tiles.
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainLodControl.java b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainLodControl.java
index 6471a5746..aedd744fd 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainLodControl.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainLodControl.java
@@ -36,8 +36,6 @@ import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
-import java.util.List;
-
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
@@ -50,6 +48,7 @@ import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
 import com.jme3.terrain.geomipmap.lodcalc.LodCalculator;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Tells the terrain to update its Level of Detail.
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainPatch.java b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainPatch.java
index e1d746a86..fd10f8159 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainPatch.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainPatch.java
@@ -42,27 +42,18 @@ import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.util.HashMap;
-
-import com.jme3.math.FastMath;
-import com.jme3.math.Ray;
-import com.jme3.math.Triangle;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.terrain.geomipmap.TerrainQuad.LocationHeight;
-import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
-import com.jme3.terrain.geomipmap.lodcalc.LodCalculator;
-import com.jme3.terrain.geomipmap.lodcalc.LodCalculatorFactory;
 import com.jme3.terrain.geomipmap.lodcalc.util.EntropyComputeUtil;
 import com.jme3.util.BufferUtils;
-import com.jme3.util.TangentBinormalGenerator;
 import java.io.IOException;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.HashMap;
 import java.util.List;
 
 
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainQuad.java b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainQuad.java
index 80d956d23..ad33a6ff0 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainQuad.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/TerrainQuad.java
@@ -32,13 +32,6 @@
 
 package com.jme3.terrain.geomipmap;
 
-import com.jme3.material.Material;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.Collidable;
@@ -47,6 +40,7 @@ import com.jme3.export.InputCapsule;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
+import com.jme3.material.Material;
 import com.jme3.math.FastMath;
 import com.jme3.math.Ray;
 import com.jme3.math.Vector2f;
@@ -57,17 +51,19 @@ import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.WireBox;
 import com.jme3.terrain.ProgressMonitor;
 import com.jme3.terrain.Terrain;
-import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
 import com.jme3.terrain.geomipmap.lodcalc.LodCalculator;
-import com.jme3.terrain.geomipmap.lodcalc.SimpleLodThreshold;
 import com.jme3.terrain.geomipmap.picking.BresenhamTerrainPicker;
 import com.jme3.terrain.geomipmap.picking.TerrainPickData;
 import com.jme3.terrain.geomipmap.picking.TerrainPicker;
-import com.jme3.util.BufferUtils;
 import com.jme3.util.TangentBinormalGenerator;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/UpdatedTerrainPatch.java b/engine/src/terrain/com/jme3/terrain/geomipmap/UpdatedTerrainPatch.java
index 1f3b1fcad..7a335d0e6 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/UpdatedTerrainPatch.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/UpdatedTerrainPatch.java
@@ -32,9 +32,8 @@
 
 package com.jme3.terrain.geomipmap;
 
-import java.nio.IntBuffer;
-
 import com.jme3.scene.VertexBuffer.Type;
+import java.nio.IntBuffer;
 
 /**
  * Stores a terrain patch's details so the LOD background thread can update
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java
index 8ee5b7901..0c61e75d8 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/AssetTileLoader.java
@@ -10,8 +10,8 @@ import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.Vector3f;
-import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.TerrainGridTileLoader;
+import com.jme3.terrain.geomipmap.TerrainQuad;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java
index 694aea7da..4f0ad209c 100644
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/ImageTileLoader.java
@@ -13,12 +13,7 @@ import com.jme3.export.JmeImporter;
 import com.jme3.math.Vector3f;
 import com.jme3.terrain.geomipmap.TerrainGridTileLoader;
 import com.jme3.terrain.geomipmap.TerrainQuad;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
-import com.jme3.terrain.heightmap.Grayscale16BitHeightMap;
-import com.jme3.terrain.heightmap.HeightMap;
-import com.jme3.terrain.heightmap.ImageBasedHeightMap;
-import com.jme3.terrain.heightmap.ImageHeightmap;
-import com.jme3.terrain.heightmap.Namer;
+import com.jme3.terrain.heightmap.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/engine/src/terrain/com/jme3/terrain/heightmap/FractalHeightMapGrid.java b/engine/src/terrain/com/jme3/terrain/heightmap/FractalHeightMapGrid.java
index 15b1ad4cf..483bc5da4 100644
--- a/engine/src/terrain/com/jme3/terrain/heightmap/FractalHeightMapGrid.java
+++ b/engine/src/terrain/com/jme3/terrain/heightmap/FractalHeightMapGrid.java
@@ -31,18 +31,15 @@
  */
 package com.jme3.terrain.heightmap;
 
+import com.jme3.math.Vector3f;
+import com.jme3.terrain.MapUtils;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.nio.FloatBuffer;
-
 import javax.imageio.ImageIO;
-
 import org.novyon.noise.Basis;
 
-import com.jme3.math.Vector3f;
-import com.jme3.terrain.MapUtils;
-
 @Deprecated
 /**
  * @Deprecated in favor of FractalTileLoader
diff --git a/engine/src/terrain/com/jme3/terrain/heightmap/RawHeightMap.java b/engine/src/terrain/com/jme3/terrain/heightmap/RawHeightMap.java
index b838d6d4a..03189617d 100644
--- a/engine/src/terrain/com/jme3/terrain/heightmap/RawHeightMap.java
+++ b/engine/src/terrain/com/jme3/terrain/heightmap/RawHeightMap.java
@@ -33,12 +33,7 @@ package com.jme3.terrain.heightmap;
 
 import com.jme3.math.FastMath;
 import com.jme3.util.LittleEndien;
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.util.logging.Logger;
 
diff --git a/engine/src/test/jme3test/TestChooser.java b/engine/src/test/jme3test/TestChooser.java
index 9495ad793..3d8c1f87f 100644
--- a/engine/src/test/jme3test/TestChooser.java
+++ b/engine/src/test/jme3test/TestChooser.java
@@ -32,17 +32,11 @@
 
 package jme3test;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.HeadlessException;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import com.jme3.app.Application;
+import com.jme3.app.SimpleApplication;
+import com.jme3.system.JmeContext;
+import java.awt.*;
+import java.awt.event.*;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -61,7 +55,6 @@ import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
-
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.DocumentEvent;
@@ -69,10 +62,6 @@ import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import com.jme3.app.Application;
-import com.jme3.app.SimpleApplication;
-import com.jme3.system.JmeContext;
-
 
 /**
  * Class with a main method that displays a dialog to choose any jME demo to be
diff --git a/engine/src/test/jme3test/animation/TestCameraMotionPath.java b/engine/src/test/jme3test/animation/TestCameraMotionPath.java
index 532e5525c..ba9688b7b 100644
--- a/engine/src/test/jme3test/animation/TestCameraMotionPath.java
+++ b/engine/src/test/jme3test/animation/TestCameraMotionPath.java
@@ -32,10 +32,10 @@
 package jme3test.animation;
 
 import com.jme3.animation.LoopMode;
-import com.jme3.cinematic.events.MotionTrack;
+import com.jme3.app.SimpleApplication;
 import com.jme3.cinematic.MotionPath;
 import com.jme3.cinematic.MotionPathListener;
-import com.jme3.app.SimpleApplication;
+import com.jme3.cinematic.events.MotionTrack;
 import com.jme3.font.BitmapText;
 import com.jme3.input.ChaseCamera;
 import com.jme3.input.KeyInput;
diff --git a/engine/src/test/jme3test/animation/TestCinematic.java b/engine/src/test/jme3test/animation/TestCinematic.java
index 876376e97..1b3958575 100644
--- a/engine/src/test/jme3test/animation/TestCinematic.java
+++ b/engine/src/test/jme3test/animation/TestCinematic.java
@@ -31,20 +31,12 @@
  */
 package jme3test.animation;
 
-import com.jme3.cinematic.Cinematic;
 import com.jme3.animation.LoopMode;
-import com.jme3.cinematic.events.CinematicEvent;
-import com.jme3.cinematic.events.MotionTrack;
-import com.jme3.cinematic.MotionPath;
-import com.jme3.cinematic.events.SoundTrack;
 import com.jme3.app.SimpleApplication;
-import com.jme3.cinematic.events.AbstractCinematicEvent;
-import com.jme3.cinematic.events.AnimationTrack;
+import com.jme3.cinematic.Cinematic;
+import com.jme3.cinematic.MotionPath;
 import com.jme3.cinematic.PlayState;
-import com.jme3.cinematic.events.CinematicEventListener;
-import com.jme3.cinematic.events.PositionTrack;
-import com.jme3.cinematic.events.RotationTrack;
-import com.jme3.cinematic.events.ScaleTrack;
+import com.jme3.cinematic.events.*;
 import com.jme3.font.BitmapText;
 import com.jme3.input.ChaseCamera;
 import com.jme3.input.controls.ActionListener;
diff --git a/engine/src/test/jme3test/animation/TestMotionPath.java b/engine/src/test/jme3test/animation/TestMotionPath.java
index 30724e844..3adcece6e 100644
--- a/engine/src/test/jme3test/animation/TestMotionPath.java
+++ b/engine/src/test/jme3test/animation/TestMotionPath.java
@@ -31,10 +31,10 @@
  */
 package jme3test.animation;
 
-import com.jme3.cinematic.events.MotionTrack;
+import com.jme3.app.SimpleApplication;
 import com.jme3.cinematic.MotionPath;
 import com.jme3.cinematic.MotionPathListener;
-import com.jme3.app.SimpleApplication;
+import com.jme3.cinematic.events.MotionTrack;
 import com.jme3.font.BitmapText;
 import com.jme3.input.ChaseCamera;
 import com.jme3.input.KeyInput;
diff --git a/engine/src/test/jme3test/app/TestIDList.java b/engine/src/test/jme3test/app/TestIDList.java
index 03ed4b2b8..4e33eaaea 100644
--- a/engine/src/test/jme3test/app/TestIDList.java
+++ b/engine/src/test/jme3test/app/TestIDList.java
@@ -33,13 +33,7 @@
 package jme3test.app;
 
 import com.jme3.renderer.IDList;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 public class TestIDList {
 
diff --git a/engine/src/test/jme3test/asset/TestManyLocators.java b/engine/src/test/jme3test/asset/TestManyLocators.java
index c91eb11ab..a11741e95 100644
--- a/engine/src/test/jme3test/asset/TestManyLocators.java
+++ b/engine/src/test/jme3test/asset/TestManyLocators.java
@@ -32,12 +32,7 @@
 
 package jme3test.asset;
 
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.DesktopAssetManager;
-import com.jme3.asset.ModelKey;
-import com.jme3.asset.TextureKey;
+import com.jme3.asset.*;
 import com.jme3.asset.plugins.ClasspathLocator;
 import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.asset.plugins.UrlLocator;
diff --git a/engine/src/test/jme3test/asset/TestOnlineJar.java b/engine/src/test/jme3test/asset/TestOnlineJar.java
index 712297039..908188d0b 100644
--- a/engine/src/test/jme3test/asset/TestOnlineJar.java
+++ b/engine/src/test/jme3test/asset/TestOnlineJar.java
@@ -32,17 +32,14 @@
 
 package jme3test.asset;
 
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetManager;
-import com.jme3.asset.DesktopAssetManager;
 import com.jme3.asset.TextureKey;
 import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
-import com.jme3.texture.plugins.AWTLoader;
 
 /**
  * This tests loading a file from a jar stored online.
diff --git a/engine/src/test/jme3test/asset/TestUrlLoading.java b/engine/src/test/jme3test/asset/TestUrlLoading.java
index 837ff33fe..6afd4df30 100644
--- a/engine/src/test/jme3test/asset/TestUrlLoading.java
+++ b/engine/src/test/jme3test/asset/TestUrlLoading.java
@@ -32,12 +32,12 @@
 
 package jme3test.asset;
 
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
 import com.jme3.asset.plugins.UrlLocator;
 import com.jme3.material.Material;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
 import com.jme3.texture.Texture;
 
diff --git a/engine/src/test/jme3test/audio/TestMusicPlayer.java b/engine/src/test/jme3test/audio/TestMusicPlayer.java
index 0b42dab9a..2399fe3e8 100644
--- a/engine/src/test/jme3test/audio/TestMusicPlayer.java
+++ b/engine/src/test/jme3test/audio/TestMusicPlayer.java
@@ -33,20 +33,12 @@
 package jme3test.audio;
 
 import com.jme3.asset.AssetInfo;
-import com.jme3.audio.AudioKey;
-import com.jme3.audio.AudioData;
-import com.jme3.audio.AudioRenderer;
-import com.jme3.audio.AudioNode;
 import com.jme3.audio.AudioNode.Status;
-import com.jme3.audio.Listener;
+import com.jme3.audio.*;
 import com.jme3.audio.plugins.OGGLoader;
 import com.jme3.system.AppSettings;
 import com.jme3.system.JmeSystem;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import javax.swing.JFileChooser;
 
 public class TestMusicPlayer extends javax.swing.JFrame {
diff --git a/engine/src/test/jme3test/awt/TestCanvas.java b/engine/src/test/jme3test/awt/TestCanvas.java
index 31c2809fd..6351ee3b6 100644
--- a/engine/src/test/jme3test/awt/TestCanvas.java
+++ b/engine/src/test/jme3test/awt/TestCanvas.java
@@ -49,15 +49,7 @@ import java.util.concurrent.Callable;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
+import javax.swing.*;
 
 public class TestCanvas {
 
diff --git a/engine/src/test/jme3test/batching/TestBatchNodeCluster.java b/engine/src/test/jme3test/batching/TestBatchNodeCluster.java
index afe806420..1da300353 100644
--- a/engine/src/test/jme3test/batching/TestBatchNodeCluster.java
+++ b/engine/src/test/jme3test/batching/TestBatchNodeCluster.java
@@ -7,25 +7,21 @@ package jme3test.batching;
 import com.jme3.app.SimpleApplication;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
+import com.jme3.input.controls.KeyTrigger;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Box;
-import com.jme3.system.AppSettings;
-import com.jme3.input.controls.KeyTrigger;
-import java.util.ArrayList;
-import java.util.Random;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
+import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.BloomFilter;
-import com.jme3.scene.BatchNode;
-import com.jme3.scene.Node;
-import com.jme3.scene.SimpleBatchNode;
-import com.jme3.scene.Spatial;
+import com.jme3.scene.*;
 import com.jme3.scene.debug.Arrow;
+import com.jme3.scene.shape.Box;
+import com.jme3.system.AppSettings;
 import com.jme3.system.NanoTimer;
+import java.util.ArrayList;
+import java.util.Random;
 
 public class TestBatchNodeCluster extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/batching/TestBatchNodeTower.java b/engine/src/test/jme3test/batching/TestBatchNodeTower.java
index eb764b838..57285d0ab 100644
--- a/engine/src/test/jme3test/batching/TestBatchNodeTower.java
+++ b/engine/src/test/jme3test/batching/TestBatchNodeTower.java
@@ -37,10 +37,9 @@ package jme3test.batching;
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import jme3test.bullet.*;
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
@@ -54,7 +53,6 @@ import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.BatchNode;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.SimpleBatchNode;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Sphere;
 import com.jme3.scene.shape.Sphere.TextureMode;
@@ -65,6 +63,7 @@ import com.jme3.system.AppSettings;
 import com.jme3.system.NanoTimer;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
+import jme3test.bullet.BombControl;
 
 /**
  *
diff --git a/engine/src/test/jme3test/bullet/PhysicsHoverControl.java b/engine/src/test/jme3test/bullet/PhysicsHoverControl.java
index 3d85b16c4..bf3c6f719 100644
--- a/engine/src/test/jme3test/bullet/PhysicsHoverControl.java
+++ b/engine/src/test/jme3test/bullet/PhysicsHoverControl.java
@@ -41,7 +41,6 @@ import com.jme3.export.JmeExporter;
 import com.jme3.export.JmeImporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
diff --git a/engine/src/test/jme3test/bullet/PhysicsTestHelper.java b/engine/src/test/jme3test/bullet/PhysicsTestHelper.java
index dde39fe55..173a5a5b7 100644
--- a/engine/src/test/jme3test/bullet/PhysicsTestHelper.java
+++ b/engine/src/test/jme3test/bullet/PhysicsTestHelper.java
@@ -17,7 +17,6 @@ import com.jme3.input.controls.MouseButtonTrigger;
 import com.jme3.light.AmbientLight;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
diff --git a/engine/src/test/jme3test/bullet/TestAttachDriver.java b/engine/src/test/jme3test/bullet/TestAttachDriver.java
index 9130c8d2d..31f5f2f45 100644
--- a/engine/src/test/jme3test/bullet/TestAttachDriver.java
+++ b/engine/src/test/jme3test/bullet/TestAttachDriver.java
@@ -32,9 +32,9 @@
 
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.CompoundCollisionShape;
@@ -46,11 +46,7 @@ import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.shape.Box;
diff --git a/engine/src/test/jme3test/bullet/TestAttachGhostObject.java b/engine/src/test/jme3test/bullet/TestAttachGhostObject.java
index 560631aab..2a117f2a1 100644
--- a/engine/src/test/jme3test/bullet/TestAttachGhostObject.java
+++ b/engine/src/test/jme3test/bullet/TestAttachGhostObject.java
@@ -31,8 +31,8 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
@@ -43,8 +43,6 @@ import com.jme3.bullet.joints.HingeJoint;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 
diff --git a/engine/src/test/jme3test/bullet/TestBoneRagdoll.java b/engine/src/test/jme3test/bullet/TestBoneRagdoll.java
index 1bf21df63..cf62ca28f 100644
--- a/engine/src/test/jme3test/bullet/TestBoneRagdoll.java
+++ b/engine/src/test/jme3test/bullet/TestBoneRagdoll.java
@@ -31,14 +31,10 @@
  */
 package jme3test.bullet;
 
-import com.jme3.animation.AnimChannel;
-import com.jme3.animation.AnimControl;
-import com.jme3.animation.AnimEventListener;
-import com.jme3.animation.Bone;
-import com.jme3.animation.LoopMode;
-import com.jme3.bullet.BulletAppState;
+import com.jme3.animation.*;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionEvent;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
diff --git a/engine/src/test/jme3test/bullet/TestBrickTower.java b/engine/src/test/jme3test/bullet/TestBrickTower.java
index 7808dca6c..0e58714c3 100644
--- a/engine/src/test/jme3test/bullet/TestBrickTower.java
+++ b/engine/src/test/jme3test/bullet/TestBrickTower.java
@@ -37,9 +37,9 @@ package jme3test.bullet;
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
diff --git a/engine/src/test/jme3test/bullet/TestBrickWall.java b/engine/src/test/jme3test/bullet/TestBrickWall.java
index 198a238f1..1b9a7d786 100644
--- a/engine/src/test/jme3test/bullet/TestBrickWall.java
+++ b/engine/src/test/jme3test/bullet/TestBrickWall.java
@@ -31,9 +31,9 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
diff --git a/engine/src/test/jme3test/bullet/TestCcd.java b/engine/src/test/jme3test/bullet/TestCcd.java
index 5645f859d..1e9949a27 100644
--- a/engine/src/test/jme3test/bullet/TestCcd.java
+++ b/engine/src/test/jme3test/bullet/TestCcd.java
@@ -31,8 +31,8 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.MeshCollisionShape;
diff --git a/engine/src/test/jme3test/bullet/TestCollisionGroups.java b/engine/src/test/jme3test/bullet/TestCollisionGroups.java
index ddd57909a..68b11d1e5 100644
--- a/engine/src/test/jme3test/bullet/TestCollisionGroups.java
+++ b/engine/src/test/jme3test/bullet/TestCollisionGroups.java
@@ -31,15 +31,13 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionObject;
 import com.jme3.bullet.collision.shapes.MeshCollisionShape;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.scene.Node;
diff --git a/engine/src/test/jme3test/bullet/TestCollisionListener.java b/engine/src/test/jme3test/bullet/TestCollisionListener.java
index f659e2240..bad8794a3 100644
--- a/engine/src/test/jme3test/bullet/TestCollisionListener.java
+++ b/engine/src/test/jme3test/bullet/TestCollisionListener.java
@@ -32,14 +32,12 @@
 
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionEvent;
 import com.jme3.bullet.collision.PhysicsCollisionListener;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.renderer.RenderManager;
 import com.jme3.scene.shape.Sphere;
 import com.jme3.scene.shape.Sphere.TextureMode;
diff --git a/engine/src/test/jme3test/bullet/TestCollisionShapeFactory.java b/engine/src/test/jme3test/bullet/TestCollisionShapeFactory.java
index 13bdccb64..3702091da 100644
--- a/engine/src/test/jme3test/bullet/TestCollisionShapeFactory.java
+++ b/engine/src/test/jme3test/bullet/TestCollisionShapeFactory.java
@@ -31,15 +31,14 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/test/jme3test/bullet/TestFancyCar.java b/engine/src/test/jme3test/bullet/TestFancyCar.java
index 6a4a8967e..9d9a6a566 100644
--- a/engine/src/test/jme3test/bullet/TestFancyCar.java
+++ b/engine/src/test/jme3test/bullet/TestFancyCar.java
@@ -31,9 +31,9 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingBox;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.control.VehicleControl;
diff --git a/engine/src/test/jme3test/bullet/TestGhostObject.java b/engine/src/test/jme3test/bullet/TestGhostObject.java
index ff08817dd..953937916 100644
--- a/engine/src/test/jme3test/bullet/TestGhostObject.java
+++ b/engine/src/test/jme3test/bullet/TestGhostObject.java
@@ -33,15 +33,13 @@
 package jme3test.bullet;
 
 import com.jme3.app.Application;
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.CollisionShape;
 import com.jme3.bullet.control.GhostControl;
 import com.jme3.bullet.control.RigidBodyControl;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.shape.Box;
diff --git a/engine/src/test/jme3test/bullet/TestHoveringTank.java b/engine/src/test/jme3test/bullet/TestHoveringTank.java
index 56b4c4adc..4059c0b53 100644
--- a/engine/src/test/jme3test/bullet/TestHoveringTank.java
+++ b/engine/src/test/jme3test/bullet/TestHoveringTank.java
@@ -49,15 +49,10 @@ import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix3f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.shadow.PssmShadowRenderer;
 import com.jme3.shadow.PssmShadowRenderer.CompareMode;
diff --git a/engine/src/test/jme3test/bullet/TestLocalPhysics.java b/engine/src/test/jme3test/bullet/TestLocalPhysics.java
index 849d02666..cba8f863d 100644
--- a/engine/src/test/jme3test/bullet/TestLocalPhysics.java
+++ b/engine/src/test/jme3test/bullet/TestLocalPhysics.java
@@ -31,19 +31,15 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.shape.Sphere;
-import com.jme3.bullet.collision.shapes.BoxCollisionShape;
-import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
-import com.jme3.bullet.collision.shapes.MeshCollisionShape;
-import com.jme3.bullet.collision.shapes.PlaneCollisionShape;
-import com.jme3.bullet.collision.shapes.SphereCollisionShape;
+import com.jme3.bullet.collision.shapes.*;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.math.Plane;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
+import com.jme3.scene.shape.Sphere;
 
 /**
  * This is a basic Test of jbullet-jme functions
diff --git a/engine/src/test/jme3test/bullet/TestPhysicsCar.java b/engine/src/test/jme3test/bullet/TestPhysicsCar.java
index e34472b09..11847ba87 100644
--- a/engine/src/test/jme3test/bullet/TestPhysicsCar.java
+++ b/engine/src/test/jme3test/bullet/TestPhysicsCar.java
@@ -32,8 +32,8 @@
 
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.collision.shapes.CompoundCollisionShape;
diff --git a/engine/src/test/jme3test/bullet/TestPhysicsCharacter.java b/engine/src/test/jme3test/bullet/TestPhysicsCharacter.java
index 2e7cc8698..c58d11200 100644
--- a/engine/src/test/jme3test/bullet/TestPhysicsCharacter.java
+++ b/engine/src/test/jme3test/bullet/TestPhysicsCharacter.java
@@ -24,8 +24,8 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
 import com.jme3.bullet.control.CharacterControl;
diff --git a/engine/src/test/jme3test/bullet/TestPhysicsHingeJoint.java b/engine/src/test/jme3test/bullet/TestPhysicsHingeJoint.java
index 1fb57f93d..95b4b3076 100644
--- a/engine/src/test/jme3test/bullet/TestPhysicsHingeJoint.java
+++ b/engine/src/test/jme3test/bullet/TestPhysicsHingeJoint.java
@@ -32,8 +32,8 @@
 
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.BoxCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
@@ -41,8 +41,6 @@ import com.jme3.bullet.joints.HingeJoint;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 
diff --git a/engine/src/test/jme3test/bullet/TestPhysicsReadWrite.java b/engine/src/test/jme3test/bullet/TestPhysicsReadWrite.java
index 5c3299a9b..b31d79a51 100644
--- a/engine/src/test/jme3test/bullet/TestPhysicsReadWrite.java
+++ b/engine/src/test/jme3test/bullet/TestPhysicsReadWrite.java
@@ -33,24 +33,19 @@
 package jme3test.bullet;
 
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
-
-import com.jme3.math.Vector3f;
-import com.jme3.renderer.RenderManager;
-import com.jme3.scene.shape.Sphere;
-import com.jme3.bullet.collision.shapes.BoxCollisionShape;
-import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
-import com.jme3.bullet.collision.shapes.MeshCollisionShape;
-import com.jme3.bullet.collision.shapes.PlaneCollisionShape;
-import com.jme3.bullet.collision.shapes.SphereCollisionShape;
+import com.jme3.bullet.collision.shapes.*;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.bullet.joints.HingeJoint;
 import com.jme3.export.binary.BinaryExporter;
 import com.jme3.export.binary.BinaryImporter;
 import com.jme3.math.Plane;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.RenderManager;
 import com.jme3.scene.Node;
+import com.jme3.scene.shape.Sphere;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/engine/src/test/jme3test/bullet/TestQ3.java b/engine/src/test/jme3test/bullet/TestQ3.java
index dbd6ce7a5..1d18c4bfe 100644
--- a/engine/src/test/jme3test/bullet/TestQ3.java
+++ b/engine/src/test/jme3test/bullet/TestQ3.java
@@ -32,10 +32,10 @@
 
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.asset.plugins.ZipLocator;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
diff --git a/engine/src/test/jme3test/bullet/TestRagdollCharacter.java b/engine/src/test/jme3test/bullet/TestRagdollCharacter.java
index 4790741e0..bdf513373 100644
--- a/engine/src/test/jme3test/bullet/TestRagdollCharacter.java
+++ b/engine/src/test/jme3test/bullet/TestRagdollCharacter.java
@@ -35,9 +35,9 @@ import com.jme3.animation.AnimChannel;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimEventListener;
 import com.jme3.animation.LoopMode;
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.control.KinematicRagdollControl;
 import com.jme3.bullet.control.RigidBodyControl;
diff --git a/engine/src/test/jme3test/bullet/TestSimplePhysics.java b/engine/src/test/jme3test/bullet/TestSimplePhysics.java
index 96581f37e..21706afb3 100644
--- a/engine/src/test/jme3test/bullet/TestSimplePhysics.java
+++ b/engine/src/test/jme3test/bullet/TestSimplePhysics.java
@@ -31,19 +31,15 @@
  */
 package jme3test.bullet;
 
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.shape.Sphere;
-import com.jme3.bullet.collision.shapes.BoxCollisionShape;
-import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
-import com.jme3.bullet.collision.shapes.MeshCollisionShape;
-import com.jme3.bullet.collision.shapes.PlaneCollisionShape;
-import com.jme3.bullet.collision.shapes.SphereCollisionShape;
+import com.jme3.bullet.collision.shapes.*;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.math.Plane;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
+import com.jme3.scene.shape.Sphere;
 
 /**
  * This is a basic Test of jbullet-jme functions
diff --git a/engine/src/test/jme3test/bullet/TestWalkingChar.java b/engine/src/test/jme3test/bullet/TestWalkingChar.java
index 407d3b698..8a5038085 100644
--- a/engine/src/test/jme3test/bullet/TestWalkingChar.java
+++ b/engine/src/test/jme3test/bullet/TestWalkingChar.java
@@ -35,8 +35,8 @@ import com.jme3.animation.AnimChannel;
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.AnimEventListener;
 import com.jme3.animation.LoopMode;
-import com.jme3.bullet.BulletAppState;
 import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.PhysicsSpace;
 import com.jme3.bullet.collision.PhysicsCollisionEvent;
 import com.jme3.bullet.collision.PhysicsCollisionListener;
diff --git a/engine/src/test/jme3test/collision/TestMousePick.java b/engine/src/test/jme3test/collision/TestMousePick.java
index fa2d64a43..835b2c6a3 100644
--- a/engine/src/test/jme3test/collision/TestMousePick.java
+++ b/engine/src/test/jme3test/collision/TestMousePick.java
@@ -46,7 +46,6 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.debug.Arrow;
 import com.jme3.scene.shape.Box;
-import com.jme3.scene.shape.Sphere;
 
 public class TestMousePick extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/collision/TestRayCasting.java b/engine/src/test/jme3test/collision/TestRayCasting.java
index e4e75cc57..b2ef0de2f 100644
--- a/engine/src/test/jme3test/collision/TestRayCasting.java
+++ b/engine/src/test/jme3test/collision/TestRayCasting.java
@@ -33,7 +33,6 @@
 package jme3test.collision;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetKey;
 import com.jme3.bounding.BoundingSphere;
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
diff --git a/engine/src/test/jme3test/collision/TestTriangleCollision.java b/engine/src/test/jme3test/collision/TestTriangleCollision.java
index 56ee49679..29ed81feb 100644
--- a/engine/src/test/jme3test/collision/TestTriangleCollision.java
+++ b/engine/src/test/jme3test/collision/TestTriangleCollision.java
@@ -35,17 +35,17 @@ package jme3test.collision;
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.collision.CollisionResults;
-import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.shape.Box;
-import com.jme3.scene.Geometry;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.shape.Box;
 
 public class TestTriangleCollision extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/effect/TestEverything.java b/engine/src/test/jme3test/effect/TestEverything.java
index a0e0d1e44..a3ada4d88 100644
--- a/engine/src/test/jme3test/effect/TestEverything.java
+++ b/engine/src/test/jme3test/effect/TestEverything.java
@@ -35,11 +35,7 @@ package jme3test.effect;
 import com.jme3.app.SimpleApplication;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.HDRRenderer;
 import com.jme3.renderer.Caps;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
diff --git a/engine/src/test/jme3test/effect/TestMovingParticle.java b/engine/src/test/jme3test/effect/TestMovingParticle.java
index 2e98a29a9..af4b67546 100644
--- a/engine/src/test/jme3test/effect/TestMovingParticle.java
+++ b/engine/src/test/jme3test/effect/TestMovingParticle.java
@@ -34,10 +34,8 @@ package jme3test.effect;
 import com.jme3.app.SimpleApplication;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh.Type;
-import com.jme3.effect.shapes.EmitterSphereShape;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.InputListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
diff --git a/engine/src/test/jme3test/effect/TestParticleExportingCloning.java b/engine/src/test/jme3test/effect/TestParticleExportingCloning.java
index f5d737e04..df6390a72 100644
--- a/engine/src/test/jme3test/effect/TestParticleExportingCloning.java
+++ b/engine/src/test/jme3test/effect/TestParticleExportingCloning.java
@@ -42,8 +42,6 @@ import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class TestParticleExportingCloning extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/games/CubeField.java b/engine/src/test/jme3test/games/CubeField.java
index 75413c171..e2a84b778 100644
--- a/engine/src/test/jme3test/games/CubeField.java
+++ b/engine/src/test/jme3test/games/CubeField.java
@@ -32,8 +32,6 @@
 
 package jme3test.games;
 
-import java.util.ArrayList;
-
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingVolume;
 import com.jme3.font.BitmapFont;
@@ -51,6 +49,7 @@ import com.jme3.scene.Node;
 import com.jme3.scene.Spatial.CullHint;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Dome;
+import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/engine/src/test/jme3test/gui/TestBitmapFont.java b/engine/src/test/jme3test/gui/TestBitmapFont.java
index a8c972504..088046e47 100644
--- a/engine/src/test/jme3test/gui/TestBitmapFont.java
+++ b/engine/src/test/jme3test/gui/TestBitmapFont.java
@@ -32,8 +32,6 @@
 
 package jme3test.gui;
 
-import net.java.games.input.RawInputEnvironmentPlugin;
-
 import com.jme3.app.SimpleApplication;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
@@ -43,12 +41,7 @@ import com.jme3.input.KeyInput;
 import com.jme3.input.RawInputListener;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.input.event.JoyAxisEvent;
-import com.jme3.input.event.JoyButtonEvent;
-import com.jme3.input.event.KeyInputEvent;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-import com.jme3.input.event.TouchEvent;
+import com.jme3.input.event.*;
 
 public class TestBitmapFont extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/gui/TestOrtho.java b/engine/src/test/jme3test/gui/TestOrtho.java
index 7e6a8feda..83a151718 100644
--- a/engine/src/test/jme3test/gui/TestOrtho.java
+++ b/engine/src/test/jme3test/gui/TestOrtho.java
@@ -33,7 +33,6 @@
 package jme3test.gui;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.math.Vector3f;
 import com.jme3.ui.Picture;
 
 public class TestOrtho extends SimpleApplication {
diff --git a/engine/src/test/jme3test/gui/TestSoftwareMouse.java b/engine/src/test/jme3test/gui/TestSoftwareMouse.java
index 64c7eae15..32c680153 100644
--- a/engine/src/test/jme3test/gui/TestSoftwareMouse.java
+++ b/engine/src/test/jme3test/gui/TestSoftwareMouse.java
@@ -34,12 +34,7 @@ package jme3test.gui;
 
 import com.jme3.app.SimpleApplication;
 import com.jme3.input.RawInputListener;
-import com.jme3.input.event.JoyAxisEvent;
-import com.jme3.input.event.JoyButtonEvent;
-import com.jme3.input.event.KeyInputEvent;
-import com.jme3.input.event.MouseButtonEvent;
-import com.jme3.input.event.MouseMotionEvent;
-import com.jme3.input.event.TouchEvent;
+import com.jme3.input.event.*;
 import com.jme3.math.FastMath;
 import com.jme3.system.AppSettings;
 import com.jme3.texture.Texture;
diff --git a/engine/src/test/jme3test/helloworld/HelloInput.java b/engine/src/test/jme3test/helloworld/HelloInput.java
index 7182eb24d..c749c9616 100644
--- a/engine/src/test/jme3test/helloworld/HelloInput.java
+++ b/engine/src/test/jme3test/helloworld/HelloInput.java
@@ -33,17 +33,17 @@
 package jme3test.helloworld;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.material.Material;
-import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Box;
-import com.jme3.math.ColorRGBA;
 import com.jme3.input.KeyInput;
 import com.jme3.input.MouseInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.input.controls.MouseButtonTrigger;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.math.Vector3f;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Box;
 
 /** Sample 5 - how to map keys and mousebuttons to actions */
 public class HelloInput extends SimpleApplication {
diff --git a/engine/src/test/jme3test/helloworld/HelloJME3.java b/engine/src/test/jme3test/helloworld/HelloJME3.java
index d59e73f8e..3be80f290 100644
--- a/engine/src/test/jme3test/helloworld/HelloJME3.java
+++ b/engine/src/test/jme3test/helloworld/HelloJME3.java
@@ -34,10 +34,10 @@ package jme3test.helloworld;
 
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Box;
-import com.jme3.math.ColorRGBA;
 
 /** Sample 1 - how to get started with the most simple JME 3 application.
  * Display a blue 3D cube and view from all sides by
diff --git a/engine/src/test/jme3test/helloworld/HelloNode.java b/engine/src/test/jme3test/helloworld/HelloNode.java
index 0206eb88a..ccda211df 100644
--- a/engine/src/test/jme3test/helloworld/HelloNode.java
+++ b/engine/src/test/jme3test/helloworld/HelloNode.java
@@ -34,11 +34,11 @@ package jme3test.helloworld;
 
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.shape.Box;
-import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Node;
+import com.jme3.scene.shape.Box;
 
 /** Sample 2 - How to use nodes as handles to manipulate objects in the scene.
  * You can rotate, translate, and scale objects by manipulating their parent nodes.
diff --git a/engine/src/test/jme3test/helloworld/HelloTerrain.java b/engine/src/test/jme3test/helloworld/HelloTerrain.java
index 8c28dd63c..2b45b1d2b 100644
--- a/engine/src/test/jme3test/helloworld/HelloTerrain.java
+++ b/engine/src/test/jme3test/helloworld/HelloTerrain.java
@@ -35,10 +35,9 @@ package jme3test.helloworld;
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
-import com.jme3.terrain.heightmap.HillHeightMap; // for exercise 2
+import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
diff --git a/engine/src/test/jme3test/helloworld/HelloTerrainCollision.java b/engine/src/test/jme3test/helloworld/HelloTerrainCollision.java
index 9986de3c1..a42a85194 100644
--- a/engine/src/test/jme3test/helloworld/HelloTerrainCollision.java
+++ b/engine/src/test/jme3test/helloworld/HelloTerrainCollision.java
@@ -47,8 +47,8 @@ import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.Node;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
+import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
diff --git a/engine/src/test/jme3test/input/TestCameraNode.java b/engine/src/test/jme3test/input/TestCameraNode.java
index 59a9360fc..111260a00 100644
--- a/engine/src/test/jme3test/input/TestCameraNode.java
+++ b/engine/src/test/jme3test/input/TestCameraNode.java
@@ -30,13 +30,8 @@
 package jme3test.input;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.input.KeyInput;
 import com.jme3.input.MouseInput;
-import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.AnalogListener;
-import com.jme3.input.controls.KeyTrigger;
-import com.jme3.input.controls.MouseAxisTrigger;
-import com.jme3.input.controls.MouseButtonTrigger;
+import com.jme3.input.controls.*;
 import com.jme3.material.Material;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
diff --git a/engine/src/test/jme3test/input/TestJoystick.java b/engine/src/test/jme3test/input/TestJoystick.java
index aefe98566..2ea924ec9 100644
--- a/engine/src/test/jme3test/input/TestJoystick.java
+++ b/engine/src/test/jme3test/input/TestJoystick.java
@@ -3,7 +3,6 @@ package jme3test.input;
 import com.jme3.app.SimpleApplication;
 import com.jme3.input.JoyInput;
 import com.jme3.input.Joystick;
-import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.JoyAxisTrigger;
 import com.jme3.system.AppSettings;
diff --git a/engine/src/test/jme3test/light/TestSpotLight.java b/engine/src/test/jme3test/light/TestSpotLight.java
index b971bc806..91e6987ff 100644
--- a/engine/src/test/jme3test/light/TestSpotLight.java
+++ b/engine/src/test/jme3test/light/TestSpotLight.java
@@ -36,11 +36,7 @@ import com.jme3.app.SimpleApplication;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.SpotLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/test/jme3test/light/TestSpotLightTerrain.java b/engine/src/test/jme3test/light/TestSpotLightTerrain.java
index d7e52e25e..86a7936cc 100644
--- a/engine/src/test/jme3test/light/TestSpotLightTerrain.java
+++ b/engine/src/test/jme3test/light/TestSpotLightTerrain.java
@@ -31,13 +31,9 @@
  */
 package jme3test.light;
 
-import jme3tools.converters.ImageToAwt;
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.font.BitmapText;
-import com.jme3.input.KeyInput;
-import com.jme3.input.controls.ActionListener;
-import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.PointLight;
 import com.jme3.light.SpotLight;
@@ -48,15 +44,15 @@ import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
-import com.jme3.scene.shape.Sphere;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
-import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
+import com.jme3.terrain.heightmap.AbstractHeightMap;
+import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.util.SkyFactory;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * Uses the terrain's lighting texture with normal maps and lights.
diff --git a/engine/src/test/jme3test/light/TestTangentGenBadModels.java b/engine/src/test/jme3test/light/TestTangentGenBadModels.java
index 91c4ffba0..a786d767d 100644
--- a/engine/src/test/jme3test/light/TestTangentGenBadModels.java
+++ b/engine/src/test/jme3test/light/TestTangentGenBadModels.java
@@ -5,20 +5,16 @@ import com.jme3.font.BitmapText;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
+import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
+import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
-import com.jme3.material.Material;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.shape.Sphere;
-import com.jme3.light.DirectionalLight;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
-import com.jme3.scene.Mesh;
-import com.jme3.scene.Node;
-import com.jme3.scene.SceneGraphVisitorAdapter;
+import com.jme3.scene.*;
 import com.jme3.scene.Spatial.CullHint;
+import com.jme3.scene.shape.Sphere;
 import com.jme3.util.TangentBinormalGenerator;
 
 /**
diff --git a/engine/src/test/jme3test/light/TestTransparentShadow.java b/engine/src/test/jme3test/light/TestTransparentShadow.java
index 60678ab2c..1a0c883b5 100644
--- a/engine/src/test/jme3test/light/TestTransparentShadow.java
+++ b/engine/src/test/jme3test/light/TestTransparentShadow.java
@@ -38,11 +38,7 @@ import com.jme3.effect.ParticleMesh;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
diff --git a/engine/src/test/jme3test/material/TestBumpModel.java b/engine/src/test/jme3test/material/TestBumpModel.java
index c805cd5f3..c10ccbed5 100644
--- a/engine/src/test/jme3test/material/TestBumpModel.java
+++ b/engine/src/test/jme3test/material/TestBumpModel.java
@@ -33,7 +33,6 @@
 package jme3test.material;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetKey;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
 import com.jme3.material.Material;
diff --git a/engine/src/test/jme3test/material/TestParallax.java b/engine/src/test/jme3test/material/TestParallax.java
index 2f5cad5ef..1082c291b 100644
--- a/engine/src/test/jme3test/material/TestParallax.java
+++ b/engine/src/test/jme3test/material/TestParallax.java
@@ -38,11 +38,7 @@ import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.FXAAFilter;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
diff --git a/engine/src/test/jme3test/material/TestSimpleBumps.java b/engine/src/test/jme3test/material/TestSimpleBumps.java
index df23c9b34..6155196aa 100644
--- a/engine/src/test/jme3test/material/TestSimpleBumps.java
+++ b/engine/src/test/jme3test/material/TestSimpleBumps.java
@@ -33,7 +33,6 @@
 package jme3test.material;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
diff --git a/engine/src/test/jme3test/model/TestMonkeyHead.java b/engine/src/test/jme3test/model/TestMonkeyHead.java
index 900c67cce..396195f54 100644
--- a/engine/src/test/jme3test/model/TestMonkeyHead.java
+++ b/engine/src/test/jme3test/model/TestMonkeyHead.java
@@ -33,10 +33,8 @@
 package jme3test.model;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.AssetKey;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
-import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/test/jme3test/model/TestOgreLoading.java b/engine/src/test/jme3test/model/TestOgreLoading.java
index f8bca599f..8676b1ee4 100644
--- a/engine/src/test/jme3test/model/TestOgreLoading.java
+++ b/engine/src/test/jme3test/model/TestOgreLoading.java
@@ -32,13 +32,13 @@
 package jme3test.model;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.light.PointLight;
 import com.jme3.light.DirectionalLight;
-import com.jme3.math.Vector3f;
+import com.jme3.light.PointLight;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
-import com.jme3.scene.Spatial;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Sphere;
 
 public class TestOgreLoading extends SimpleApplication {
diff --git a/engine/src/test/jme3test/model/anim/TestCustomAnim.java b/engine/src/test/jme3test/model/anim/TestCustomAnim.java
index 80a35ed98..f1b89336f 100644
--- a/engine/src/test/jme3test/model/anim/TestCustomAnim.java
+++ b/engine/src/test/jme3test/model/anim/TestCustomAnim.java
@@ -41,7 +41,6 @@ import com.jme3.light.DirectionalLight;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
diff --git a/engine/src/test/jme3test/model/anim/TestOgreAnim.java b/engine/src/test/jme3test/model/anim/TestOgreAnim.java
index 9d53b08e4..c5f82138c 100644
--- a/engine/src/test/jme3test/model/anim/TestOgreAnim.java
+++ b/engine/src/test/jme3test/model/anim/TestOgreAnim.java
@@ -32,11 +32,7 @@
 
 package jme3test.model.anim;
 
-import com.jme3.animation.AnimChannel;
-import com.jme3.animation.AnimControl;
-import com.jme3.animation.AnimEventListener;
-import com.jme3.animation.LoopMode;
-import com.jme3.animation.SkeletonControl;
+import com.jme3.animation.*;
 import com.jme3.app.SimpleApplication;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
diff --git a/engine/src/test/jme3test/model/anim/TestSpatialAnim.java b/engine/src/test/jme3test/model/anim/TestSpatialAnim.java
index e8bee5dd9..94dfd03a4 100644
--- a/engine/src/test/jme3test/model/anim/TestSpatialAnim.java
+++ b/engine/src/test/jme3test/model/anim/TestSpatialAnim.java
@@ -1,7 +1,5 @@
 package jme3test.model.anim;
 
-import java.util.HashMap;
-
 import com.jme3.animation.AnimControl;
 import com.jme3.animation.Animation;
 import com.jme3.animation.SpatialTrack;
@@ -13,6 +11,7 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.shape.Box;
+import java.util.HashMap;
 
 public class TestSpatialAnim extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/model/shape/TestBillboard.java b/engine/src/test/jme3test/model/shape/TestBillboard.java
index f75d195eb..dc5be7f3a 100644
--- a/engine/src/test/jme3test/model/shape/TestBillboard.java
+++ b/engine/src/test/jme3test/model/shape/TestBillboard.java
@@ -35,7 +35,6 @@ package jme3test.model.shape;
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
diff --git a/engine/src/test/jme3test/model/shape/TestCustomMesh.java b/engine/src/test/jme3test/model/shape/TestCustomMesh.java
index a32b234be..1ea48fb7d 100644
--- a/engine/src/test/jme3test/model/shape/TestCustomMesh.java
+++ b/engine/src/test/jme3test/model/shape/TestCustomMesh.java
@@ -39,7 +39,6 @@ import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
-import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.BufferUtils;
 
diff --git a/engine/src/test/jme3test/network/TestChatClient.java b/engine/src/test/jme3test/network/TestChatClient.java
index 53805ab95..fddb047c4 100644
--- a/engine/src/test/jme3test/network/TestChatClient.java
+++ b/engine/src/test/jme3test/network/TestChatClient.java
@@ -31,17 +31,15 @@
  */
 package jme3test.network;
 
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.Component;
-import java.io.IOException;
-import javax.swing.*;
-
 import com.jme3.network.Client;
 import com.jme3.network.Message;
 import com.jme3.network.MessageListener;
 import com.jme3.network.Network;
-
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import javax.swing.*;
 import jme3test.network.TestChatServer.ChatMessage;
 
 /**
diff --git a/engine/src/test/jme3test/network/TestChatServer.java b/engine/src/test/jme3test/network/TestChatServer.java
index 26f6ffb3c..a2aa2ee1c 100644
--- a/engine/src/test/jme3test/network/TestChatServer.java
+++ b/engine/src/test/jme3test/network/TestChatServer.java
@@ -31,12 +31,7 @@
  */
 package jme3test.network;
 
-import com.jme3.network.Message;
-import com.jme3.network.AbstractMessage;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializable;
 import com.jme3.network.serializing.Serializer;
 
diff --git a/engine/src/test/jme3test/network/TestLatency.java b/engine/src/test/jme3test/network/TestLatency.java
index 460b327f2..91b04c40a 100644
--- a/engine/src/test/jme3test/network/TestLatency.java
+++ b/engine/src/test/jme3test/network/TestLatency.java
@@ -32,13 +32,7 @@
 
 package jme3test.network;
 
-import com.jme3.network.AbstractMessage;
-import com.jme3.network.Client;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
-import com.jme3.network.Message;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializable;
 import com.jme3.network.serializing.Serializer;
 import java.io.IOException;
diff --git a/engine/src/test/jme3test/network/TestMessages.java b/engine/src/test/jme3test/network/TestMessages.java
index 6951213c2..b99e32b6b 100644
--- a/engine/src/test/jme3test/network/TestMessages.java
+++ b/engine/src/test/jme3test/network/TestMessages.java
@@ -32,12 +32,7 @@
 
 package jme3test.network;
 
-import com.jme3.network.AbstractMessage;
-import com.jme3.network.Client;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializable;
 import com.jme3.network.serializing.Serializer;
 import java.io.IOException;
diff --git a/engine/src/test/jme3test/network/TestNetworkStress.java b/engine/src/test/jme3test/network/TestNetworkStress.java
index 5667edfda..ba8893c62 100644
--- a/engine/src/test/jme3test/network/TestNetworkStress.java
+++ b/engine/src/test/jme3test/network/TestNetworkStress.java
@@ -32,11 +32,7 @@
 
 package jme3test.network;
 
-import com.jme3.network.Client;
-import com.jme3.network.ConnectionListener;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/engine/src/test/jme3test/network/TestRemoteCall.java b/engine/src/test/jme3test/network/TestRemoteCall.java
index 78cae353b..cd1d38e5f 100644
--- a/engine/src/test/jme3test/network/TestRemoteCall.java
+++ b/engine/src/test/jme3test/network/TestRemoteCall.java
@@ -37,14 +37,11 @@ import com.jme3.export.Savable;
 import com.jme3.network.Client;
 import com.jme3.network.Network;
 import com.jme3.network.Server;
-import com.jme3.network.rmi.ObjectDef;
 import com.jme3.network.rmi.ObjectStore;
-import com.jme3.network.rmi.RemoteObjectDefMessage;
 import com.jme3.network.serializing.Serializer;
 import com.jme3.network.serializing.serializers.SavableSerializer;
 import com.jme3.scene.Spatial;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
 
 public class TestRemoteCall {
diff --git a/engine/src/test/jme3test/network/TestSerialization.java b/engine/src/test/jme3test/network/TestSerialization.java
index b4b061bda..07854ce23 100644
--- a/engine/src/test/jme3test/network/TestSerialization.java
+++ b/engine/src/test/jme3test/network/TestSerialization.java
@@ -32,22 +32,11 @@
 
 package jme3test.network;
 
-import com.jme3.network.AbstractMessage;
-import com.jme3.network.Client;
-import com.jme3.network.HostedConnection;
-import com.jme3.network.Message;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializable;
 import com.jme3.network.serializing.Serializer;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class TestSerialization implements MessageListener<HostedConnection> {
 
diff --git a/engine/src/test/jme3test/network/TestThroughput.java b/engine/src/test/jme3test/network/TestThroughput.java
index 46862fc8c..c261ec0b9 100644
--- a/engine/src/test/jme3test/network/TestThroughput.java
+++ b/engine/src/test/jme3test/network/TestThroughput.java
@@ -31,13 +31,7 @@
  */
 package jme3test.network;
 
-import com.jme3.network.AbstractMessage;
-import com.jme3.network.Client;
-import com.jme3.network.Message;
-import com.jme3.network.MessageConnection;
-import com.jme3.network.MessageListener;
-import com.jme3.network.Network;
-import com.jme3.network.Server;
+import com.jme3.network.*;
 import com.jme3.network.serializing.Serializable;
 import com.jme3.network.serializing.Serializer;
 import java.io.IOException;
diff --git a/engine/src/test/jme3test/niftygui/TestNiftyGui.java b/engine/src/test/jme3test/niftygui/TestNiftyGui.java
index fe7db742f..5a1ea1cd3 100644
--- a/engine/src/test/jme3test/niftygui/TestNiftyGui.java
+++ b/engine/src/test/jme3test/niftygui/TestNiftyGui.java
@@ -41,7 +41,6 @@ import com.jme3.scene.shape.Box;
 import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.screen.Screen;
 import de.lessvoid.nifty.screen.ScreenController;
-import java.net.URL;
 
 public class TestNiftyGui extends SimpleApplication implements ScreenController {
 
diff --git a/engine/src/test/jme3test/post/TestCrossHatch.java b/engine/src/test/jme3test/post/TestCrossHatch.java
index cc405f95f..d5230fa77 100644
--- a/engine/src/test/jme3test/post/TestCrossHatch.java
+++ b/engine/src/test/jme3test/post/TestCrossHatch.java
@@ -42,7 +42,6 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.post.filters.BloomFilter;
 import com.jme3.post.filters.CrossHatchFilter;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
diff --git a/engine/src/test/jme3test/post/TestDepthOfField.java b/engine/src/test/jme3test/post/TestDepthOfField.java
index 3fbe2f16a..cbfc384dd 100644
--- a/engine/src/test/jme3test/post/TestDepthOfField.java
+++ b/engine/src/test/jme3test/post/TestDepthOfField.java
@@ -1,7 +1,6 @@
 package jme3test.post;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.bounding.BoundingBox;
 import com.jme3.collision.CollisionResult;
 import com.jme3.collision.CollisionResults;
 import com.jme3.input.controls.ActionListener;
@@ -9,13 +8,7 @@ import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Ray;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
-
+import com.jme3.math.*;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.DepthOfFieldFilter;
 import com.jme3.renderer.Camera;
diff --git a/engine/src/test/jme3test/post/TestHDR.java b/engine/src/test/jme3test/post/TestHDR.java
index 52fbeb8db..4b26069fb 100644
--- a/engine/src/test/jme3test/post/TestHDR.java
+++ b/engine/src/test/jme3test/post/TestHDR.java
@@ -35,9 +35,9 @@ package jme3test.post;
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
+import com.jme3.post.HDRRenderer;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Box;
-import com.jme3.post.HDRRenderer;
 import com.jme3.ui.Picture;
 
 public class TestHDR extends SimpleApplication {
diff --git a/engine/src/test/jme3test/post/TestMultiRenderTarget.java b/engine/src/test/jme3test/post/TestMultiRenderTarget.java
index 5cc3d2bb3..5b31bddd1 100644
--- a/engine/src/test/jme3test/post/TestMultiRenderTarget.java
+++ b/engine/src/test/jme3test/post/TestMultiRenderTarget.java
@@ -33,14 +33,9 @@
 package jme3test.post;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Matrix4f;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.SceneProcessor;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
diff --git a/engine/src/test/jme3test/post/TestMultiViewsFilters.java b/engine/src/test/jme3test/post/TestMultiViewsFilters.java
index 0c29b987b..d2ef9d4a4 100644
--- a/engine/src/test/jme3test/post/TestMultiViewsFilters.java
+++ b/engine/src/test/jme3test/post/TestMultiViewsFilters.java
@@ -40,11 +40,7 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.post.filters.BloomFilter;
-import com.jme3.post.filters.CartoonEdgeFilter;
-import com.jme3.post.filters.CrossHatchFilter;
-import com.jme3.post.filters.FogFilter;
-import com.jme3.post.filters.RadialBlurFilter;
+import com.jme3.post.filters.*;
 import com.jme3.post.ssao.SSAOFilter;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.ViewPort;
diff --git a/engine/src/test/jme3test/post/TestMultiplesFilters.java b/engine/src/test/jme3test/post/TestMultiplesFilters.java
index d9d5931e7..87e4c4a13 100644
--- a/engine/src/test/jme3test/post/TestMultiplesFilters.java
+++ b/engine/src/test/jme3test/post/TestMultiplesFilters.java
@@ -38,8 +38,6 @@ import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
-import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
diff --git a/engine/src/test/jme3test/post/TestPostFilters.java b/engine/src/test/jme3test/post/TestPostFilters.java
index 917180db6..6b41059d3 100644
--- a/engine/src/test/jme3test/post/TestPostFilters.java
+++ b/engine/src/test/jme3test/post/TestPostFilters.java
@@ -37,11 +37,7 @@ import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.ColorOverlayFilter;
 import com.jme3.post.filters.FadeFilter;
diff --git a/engine/src/test/jme3test/post/TestPosterization.java b/engine/src/test/jme3test/post/TestPosterization.java
index 0f553d3d5..e2c24e8be 100644
--- a/engine/src/test/jme3test/post/TestPosterization.java
+++ b/engine/src/test/jme3test/post/TestPosterization.java
@@ -42,8 +42,6 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
-import com.jme3.post.filters.BloomFilter;
-import com.jme3.post.filters.CrossHatchFilter;
 import com.jme3.post.filters.PosterizationFilter;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
diff --git a/engine/src/test/jme3test/post/TestTransparentCartoonEdge.java b/engine/src/test/jme3test/post/TestTransparentCartoonEdge.java
index 300c937fa..1fd70e3aa 100644
--- a/engine/src/test/jme3test/post/TestTransparentCartoonEdge.java
+++ b/engine/src/test/jme3test/post/TestTransparentCartoonEdge.java
@@ -4,11 +4,7 @@ import com.jme3.app.SimpleApplication;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.CartoonEdgeFilter;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
diff --git a/engine/src/test/jme3test/post/TestTransparentSSAO.java b/engine/src/test/jme3test/post/TestTransparentSSAO.java
index 828067a8c..ba2472082 100644
--- a/engine/src/test/jme3test/post/TestTransparentSSAO.java
+++ b/engine/src/test/jme3test/post/TestTransparentSSAO.java
@@ -4,11 +4,7 @@ import com.jme3.app.SimpleApplication;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.ssao.SSAOFilter;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
diff --git a/engine/src/test/jme3test/renderer/TestParallelProjection.java b/engine/src/test/jme3test/renderer/TestParallelProjection.java
index a390a3f74..2b9002704 100644
--- a/engine/src/test/jme3test/renderer/TestParallelProjection.java
+++ b/engine/src/test/jme3test/renderer/TestParallelProjection.java
@@ -38,10 +38,8 @@ import com.jme3.input.controls.AnalogListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.Spatial.CullHint;
 
 public class TestParallelProjection  extends SimpleApplication implements AnalogListener {
 
diff --git a/engine/src/test/jme3test/scene/TestSceneLoading.java b/engine/src/test/jme3test/scene/TestSceneLoading.java
index 0dc0bf027..fddef163a 100644
--- a/engine/src/test/jme3test/scene/TestSceneLoading.java
+++ b/engine/src/test/jme3test/scene/TestSceneLoading.java
@@ -33,19 +33,15 @@
 package jme3test.scene;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.TextureKey;
 import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.asset.plugins.ZipLocator;
 import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
-import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
-import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Sphere;
-import com.jme3.texture.Texture;
 import com.jme3.util.SkyFactory;
 import java.io.File;
 
diff --git a/engine/src/test/jme3test/stress/TestBatchLod.java b/engine/src/test/jme3test/stress/TestBatchLod.java
index bd1ff5cec..f5d2660fc 100644
--- a/engine/src/test/jme3test/stress/TestBatchLod.java
+++ b/engine/src/test/jme3test/stress/TestBatchLod.java
@@ -32,7 +32,6 @@
 package jme3test.stress;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.input.KeyInput;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
 import com.jme3.math.Quaternion;
diff --git a/engine/src/test/jme3test/stress/TestLodStress.java b/engine/src/test/jme3test/stress/TestLodStress.java
index a06ed5c77..84a337636 100644
--- a/engine/src/test/jme3test/stress/TestLodStress.java
+++ b/engine/src/test/jme3test/stress/TestLodStress.java
@@ -40,7 +40,6 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.control.LodControl;
-import com.jme3.scene.shape.Sphere;
 
 public class TestLodStress extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java b/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java
index 505652832..9f42391ba 100644
--- a/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java
@@ -1,13 +1,9 @@
 package jme3test.terrain;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.app.SimpleApplication;
 import com.jme3.app.state.ScreenshotAppState;
 import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.asset.plugins.ZipLocator;
-import com.jme3.bounding.BoundingBox;
 import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
 import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape;
@@ -36,6 +32,8 @@ import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import org.novyon.noise.ShaderUtils;
 import org.novyon.noise.basis.FilteredBasis;
 import org.novyon.noise.filter.IterativeFilter;
diff --git a/engine/src/test/jme3test/terrain/TerrainTest.java b/engine/src/test/jme3test/terrain/TerrainTest.java
index b7e5fd082..30a5ec9d9 100644
--- a/engine/src/test/jme3test/terrain/TerrainTest.java
+++ b/engine/src/test/jme3test/terrain/TerrainTest.java
@@ -31,7 +31,6 @@
  */
 package jme3test.terrain;
 
-import jme3tools.converters.ImageToAwt;
 import com.jme3.app.SimpleApplication;
 import com.jme3.font.BitmapText;
 import com.jme3.input.KeyInput;
@@ -44,13 +43,13 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
-import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
-import com.jme3.terrain.geomipmap.lodcalc.SimpleLodThreshold;
+import com.jme3.terrain.heightmap.AbstractHeightMap;
+import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * Demonstrates how to use terrain.
diff --git a/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java b/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java
index f69796a9f..9336df2f1 100644
--- a/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestAdvanced.java
@@ -31,14 +31,12 @@
  */
 package jme3test.terrain;
 
-import jme3tools.converters.ImageToAwt;
 import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.font.BitmapText;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
-import com.jme3.light.AmbientLight;
 import com.jme3.light.DirectionalLight;
 import com.jme3.light.PointLight;
 import com.jme3.material.Material;
@@ -47,13 +45,14 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
-import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
+import com.jme3.terrain.heightmap.AbstractHeightMap;
+import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
 import com.jme3.util.SkyFactory;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * Uses the terrain's lighting texture with normal maps and lights.
diff --git a/engine/src/test/jme3test/terrain/TerrainTestCollision.java b/engine/src/test/jme3test/terrain/TerrainTestCollision.java
index a408f7181..6b375547d 100644
--- a/engine/src/test/jme3test/terrain/TerrainTestCollision.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestCollision.java
@@ -31,11 +31,10 @@
  */
 package jme3test.terrain;
 
-import jme3tools.converters.ImageToAwt;
-import com.jme3.bullet.collision.shapes.SphereCollisionShape;
+import com.jme3.app.SimpleApplication;
 import com.jme3.bounding.BoundingBox;
 import com.jme3.bullet.BulletAppState;
-import com.jme3.app.SimpleApplication;
+import com.jme3.bullet.collision.shapes.SphereCollisionShape;
 import com.jme3.bullet.control.RigidBodyControl;
 import com.jme3.collision.CollisionResult;
 import com.jme3.collision.CollisionResults;
@@ -57,12 +56,13 @@ import com.jme3.scene.Node;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Sphere;
 import com.jme3.terrain.geomipmap.TerrainLodControl;
-import com.jme3.terrain.heightmap.AbstractHeightMap;
-import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator;
+import com.jme3.terrain.heightmap.AbstractHeightMap;
+import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
+import jme3tools.converters.ImageToAwt;
 
 /**
  * Creates a terrain object and a collision node to go with it. Then
diff --git a/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java b/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
index b8c61530d..765fd7dce 100644
--- a/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
+++ b/engine/src/test/jme3test/terrain/TerrainTestReadWrite.java
@@ -52,12 +52,7 @@ import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
 import com.jme3.texture.Texture;
 import com.jme3.texture.Texture.WrapMode;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jme3tools.converters.ImageToAwt;
diff --git a/engine/src/test/jme3test/texture/TestTexture3DLoading.java b/engine/src/test/jme3test/texture/TestTexture3DLoading.java
index 615b58bcb..bc5336230 100644
--- a/engine/src/test/jme3test/texture/TestTexture3DLoading.java
+++ b/engine/src/test/jme3test/texture/TestTexture3DLoading.java
@@ -7,23 +7,12 @@ package jme3test.texture;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.TextureKey;
 import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Quad;
-import com.jme3.texture.Image;
-import com.jme3.texture.Image.Format;
 import com.jme3.texture.Texture;
-import com.jme3.texture.Texture3D;
-import com.jme3.util.BufferUtils;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class TestTexture3DLoading extends SimpleApplication {
 
diff --git a/engine/src/test/jme3test/texture/TestTextureArray.java b/engine/src/test/jme3test/texture/TestTextureArray.java
index 84a726026..823fd7881 100644
--- a/engine/src/test/jme3test/texture/TestTextureArray.java
+++ b/engine/src/test/jme3test/texture/TestTextureArray.java
@@ -1,9 +1,6 @@
 package jme3test.texture;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jme3.app.SimpleApplication;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
@@ -15,6 +12,8 @@ import com.jme3.texture.Image;
 import com.jme3.texture.Texture;
 import com.jme3.texture.TextureArray;
 import com.jme3.util.BufferUtils;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TestTextureArray extends SimpleApplication
 {
diff --git a/engine/src/test/jme3test/water/TestPostWater.java b/engine/src/test/jme3test/water/TestPostWater.java
index ab81619b9..85ca62ab0 100644
--- a/engine/src/test/jme3test/water/TestPostWater.java
+++ b/engine/src/test/jme3test/water/TestPostWater.java
@@ -2,9 +2,7 @@ package jme3test.water;
 
 import com.jme3.app.SimpleApplication;
 import com.jme3.audio.AudioNode;
-import com.jme3.audio.Filter;
 import com.jme3.audio.LowPassFilter;
-import com.jme3.bounding.BoundingBox;
 import com.jme3.effect.ParticleEmitter;
 import com.jme3.effect.ParticleMesh;
 import com.jme3.input.controls.ActionListener;
@@ -16,15 +14,10 @@ import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
-
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.post.filters.BloomFilter;
-import com.jme3.post.filters.CartoonEdgeFilter;
 import com.jme3.post.filters.DepthOfFieldFilter;
-import com.jme3.post.filters.FogFilter;
 import com.jme3.post.filters.LightScatteringFilter;
-import com.jme3.post.filters.TranslucentBucketFilter;
-import com.jme3.post.ssao.SSAOFilter;
 import com.jme3.renderer.Camera;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
@@ -40,7 +33,6 @@ import com.jme3.texture.Texture.WrapMode;
 import com.jme3.texture.Texture2D;
 import com.jme3.util.SkyFactory;
 import com.jme3.water.WaterFilter;
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 import jme3tools.converters.ImageToAwt;
diff --git a/engine/src/test/jme3test/water/TestPostWaterLake.java b/engine/src/test/jme3test/water/TestPostWaterLake.java
index 4eb21a66c..c12501ece 100644
--- a/engine/src/test/jme3test/water/TestPostWaterLake.java
+++ b/engine/src/test/jme3test/water/TestPostWaterLake.java
@@ -38,7 +38,6 @@ import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.math.ColorRGBA;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.post.FilterPostProcessor;
 import com.jme3.scene.Spatial;
diff --git a/engine/src/test/jme3test/water/TestSceneWater.java b/engine/src/test/jme3test/water/TestSceneWater.java
index 7ea146f6d..8a9687783 100644
--- a/engine/src/test/jme3test/water/TestSceneWater.java
+++ b/engine/src/test/jme3test/water/TestSceneWater.java
@@ -37,12 +37,7 @@ import com.jme3.asset.plugins.HttpZipLocator;
 import com.jme3.asset.plugins.ZipLocator;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.FastMath;
-import com.jme3.math.Plane;
-import com.jme3.math.Quaternion;
-import com.jme3.math.Vector2f;
-import com.jme3.math.Vector3f;
+import com.jme3.math.*;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
diff --git a/engine/src/test/jme3test/water/TestSimpleWater.java b/engine/src/test/jme3test/water/TestSimpleWater.java
index 165441340..de32923dd 100644
--- a/engine/src/test/jme3test/water/TestSimpleWater.java
+++ b/engine/src/test/jme3test/water/TestSimpleWater.java
@@ -33,19 +33,16 @@
 package jme3test.water;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.asset.TextureKey;
 import com.jme3.input.KeyInput;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.material.Material;
 import com.jme3.math.Vector3f;
-import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Box;
 import com.jme3.scene.shape.Sphere;
-import com.jme3.texture.Texture;
 import com.jme3.util.SkyFactory;
 import com.jme3.water.SimpleWaterProcessor;
 
diff --git a/engine/src/tools/jme3tools/converters/model/FloatToFixed.java b/engine/src/tools/jme3tools/converters/model/FloatToFixed.java
index b2d3a4e65..0d0647aab 100644
--- a/engine/src/tools/jme3tools/converters/model/FloatToFixed.java
+++ b/engine/src/tools/jme3tools/converters/model/FloatToFixed.java
@@ -37,18 +37,14 @@ import com.jme3.math.Transform;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
-import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
+import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.BufferUtils;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 
 public class FloatToFixed {
 
diff --git a/engine/src/tools/jme3tools/converters/model/ModelConverter.java b/engine/src/tools/jme3tools/converters/model/ModelConverter.java
index 5e94bdd97..2539574ef 100644
--- a/engine/src/tools/jme3tools/converters/model/ModelConverter.java
+++ b/engine/src/tools/jme3tools/converters/model/ModelConverter.java
@@ -32,22 +32,18 @@
 
 package jme3tools.converters.model;
 
-import com.jme3.scene.Geometry;
-import com.jme3.scene.mesh.IndexBuffer;
-import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
+import com.jme3.scene.mesh.IndexBuffer;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
-import jme3tools.converters.model.strip.PrimitiveGroup;
-import jme3tools.converters.model.strip.TriStrip;
 import java.nio.Buffer;
 import java.util.Arrays;
 import java.util.Comparator;
+import jme3tools.converters.model.strip.PrimitiveGroup;
+import jme3tools.converters.model.strip.TriStrip;
 
 public class ModelConverter {
 
diff --git a/engine/src/tools/jme3tools/optimize/FastOctnode.java b/engine/src/tools/jme3tools/optimize/FastOctnode.java
index 821559db8..d9e37da09 100644
--- a/engine/src/tools/jme3tools/optimize/FastOctnode.java
+++ b/engine/src/tools/jme3tools/optimize/FastOctnode.java
@@ -33,7 +33,6 @@
 package jme3tools.optimize;
 
 import com.jme3.bounding.BoundingBox;
-import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
 import com.jme3.scene.Geometry;
 import java.util.Set;
diff --git a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
index d60cd3def..6051b4b54 100644
--- a/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
+++ b/engine/src/tools/jme3tools/optimize/GeometryBatchFactory.java
@@ -4,29 +4,18 @@ import com.jme3.material.Material;
 import com.jme3.math.Matrix4f;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
-import com.jme3.scene.Geometry;
-import com.jme3.scene.Mesh;
 import com.jme3.scene.Mesh.Mode;
-import com.jme3.scene.Node;
-import com.jme3.scene.Spatial;
-import com.jme3.scene.VertexBuffer;
+import com.jme3.scene.*;
 import com.jme3.scene.VertexBuffer.Format;
 import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.scene.VertexBuffer.Usage;
 import com.jme3.scene.mesh.IndexBuffer;
-import com.jme3.scene.mesh.VirtualIndexBuffer;
-import com.jme3.scene.mesh.WrappedIndexBuffer;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.IntMap.Entry;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class GeometryBatchFactory {
 
diff --git a/engine/src/tools/jme3tools/optimize/Octnode.java b/engine/src/tools/jme3tools/optimize/Octnode.java
index 12c4d9337..e9a00802a 100644
--- a/engine/src/tools/jme3tools/optimize/Octnode.java
+++ b/engine/src/tools/jme3tools/optimize/Octnode.java
@@ -45,11 +45,7 @@ import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.debug.WireBox;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class Octnode {
 
diff --git a/engine/src/tools/jme3tools/optimize/TriangleCollector.java b/engine/src/tools/jme3tools/optimize/TriangleCollector.java
index 9001c53e7..00f4ab124 100644
--- a/engine/src/tools/jme3tools/optimize/TriangleCollector.java
+++ b/engine/src/tools/jme3tools/optimize/TriangleCollector.java
@@ -42,12 +42,7 @@ import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
 import java.nio.Buffer;
 import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class TriangleCollector {
 
diff --git a/engine/src/xml/com/jme3/export/xml/DOMInputCapsule.java b/engine/src/xml/com/jme3/export/xml/DOMInputCapsule.java
index 03678aaf8..5db35b897 100644
--- a/engine/src/xml/com/jme3/export/xml/DOMInputCapsule.java
+++ b/engine/src/xml/com/jme3/export/xml/DOMInputCapsule.java
@@ -42,18 +42,9 @@ import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Logger;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
 
 /**
  * Part of the jME XML IO system as introduced in the google code jmexml project.
diff --git a/engine/src/xml/com/jme3/export/xml/DOMOutputCapsule.java b/engine/src/xml/com/jme3/export/xml/DOMOutputCapsule.java
index a4eddecca..a35216c12 100644
--- a/engine/src/xml/com/jme3/export/xml/DOMOutputCapsule.java
+++ b/engine/src/xml/com/jme3/export/xml/DOMOutputCapsule.java
@@ -35,7 +35,6 @@ package com.jme3.export.xml;
 import com.jme3.export.JmeExporter;
 import com.jme3.export.OutputCapsule;
 import com.jme3.export.Savable;
-import com.jme3.export.Savable;
 import com.jme3.export.SavableClassUtil;
 import com.jme3.util.IntMap;
 import com.jme3.util.IntMap.Entry;
@@ -44,13 +43,7 @@ import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-
+import java.util.*;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/engine/src/xml/com/jme3/export/xml/DOMSerializer.java b/engine/src/xml/com/jme3/export/xml/DOMSerializer.java
index 4242b4a17..b30ba1904 100644
--- a/engine/src/xml/com/jme3/export/xml/DOMSerializer.java
+++ b/engine/src/xml/com/jme3/export/xml/DOMSerializer.java
@@ -32,21 +32,9 @@
   
 package com.jme3.export.xml;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 import java.nio.charset.Charset;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
 
 /**
  * The DOMSerializer was based primarily off the DOMSerializer.java class from the 
diff --git a/engine/src/xml/com/jme3/export/xml/XMLImporter.java b/engine/src/xml/com/jme3/export/xml/XMLImporter.java
index 9a73ed7dd..cf30b8c90 100644
--- a/engine/src/xml/com/jme3/export/xml/XMLImporter.java
+++ b/engine/src/xml/com/jme3/export/xml/XMLImporter.java
@@ -34,8 +34,8 @@ package com.jme3.export.xml;
 
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetManager;
-import com.jme3.export.JmeImporter;
 import com.jme3.export.InputCapsule;
+import com.jme3.export.JmeImporter;
 import com.jme3.export.Savable;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/engine/test/com/jme/animation/CompactQuaternionArrayTest.java b/engine/test/com/jme/animation/CompactQuaternionArrayTest.java
index 81ff20461..2e328be31 100644
--- a/engine/test/com/jme/animation/CompactQuaternionArrayTest.java
+++ b/engine/test/com/jme/animation/CompactQuaternionArrayTest.java
@@ -1,15 +1,12 @@
 package com.jme.animation;
 
-import static org.junit.Assert.assertTrue;
-
+import com.jme3.animation.CompactQuaternionArray;
+import com.jme3.math.Quaternion;
 import java.util.Arrays;
-
+import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jme3.animation.CompactQuaternionArray;
-import com.jme3.math.Quaternion;
-
 public class CompactQuaternionArrayTest {
 
 	@Before
diff --git a/engine/test/com/jme/animation/CompactVector3ArrayTest.java b/engine/test/com/jme/animation/CompactVector3ArrayTest.java
index 70b38fbcd..46280df36 100644
--- a/engine/test/com/jme/animation/CompactVector3ArrayTest.java
+++ b/engine/test/com/jme/animation/CompactVector3ArrayTest.java
@@ -1,21 +1,16 @@
 package com.jme.animation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import com.jme3.animation.CompactVector3Array;
+import com.jme3.export.binary.BinaryExporter;
+import com.jme3.export.binary.BinaryImporter;
+import com.jme3.math.Vector3f;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-
+import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jme3.animation.CompactVector3Array;
-import com.jme3.export.binary.BinaryExporter;
-import com.jme3.export.binary.BinaryImporter;
-import com.jme3.math.Vector3f;
-
 public class CompactVector3ArrayTest {
     private final Vector3f[] objArray1 = new Vector3f[] {
         new Vector3f(1, 0, 1),  // 0
diff --git a/engine/test/com/jme3/font/ColorTagsTest.java b/engine/test/com/jme3/font/ColorTagsTest.java
index 47b3c9626..084a5256d 100644
--- a/engine/test/com/jme3/font/ColorTagsTest.java
+++ b/engine/test/com/jme3/font/ColorTagsTest.java
@@ -1,8 +1,7 @@
 package com.jme3.font;
 
-import static org.junit.Assert.*;
-
 import org.junit.After;
+import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/engine/test/com/jme3/math/TrigonometryTest.java b/engine/test/com/jme3/math/TrigonometryTest.java
index 2a8228e69..c9df4878f 100644
--- a/engine/test/com/jme3/math/TrigonometryTest.java
+++ b/engine/test/com/jme3/math/TrigonometryTest.java
@@ -1,7 +1,6 @@
 package com.jme3.math;
 
 import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
 public class TrigonometryTest {