diff --git a/engine/src/core/com/jme3/animation/MeshAnimationLoader.java b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java
similarity index 99%
rename from engine/src/core/com/jme3/animation/MeshAnimationLoader.java
rename to engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java
index 354430d04..75ff86579 100644
--- a/engine/src/core/com/jme3/animation/MeshAnimationLoader.java
+++ b/engine/src/ogre/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java
@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.jme3.animation;
+package com.jme3.scene.plugins.ogre;
 
 //import static com.jmex.model.XMLUtil.getAttribute;
 //import static com.jmex.model.XMLUtil.getIntAttribute;
diff --git a/engine/src/test/jme3test/niftygui/TestNiftyGui.java b/engine/src/test/jme3test/niftygui/TestNiftyGui.java
index c9ce879b7..f024a8cae 100644
--- a/engine/src/test/jme3test/niftygui/TestNiftyGui.java
+++ b/engine/src/test/jme3test/niftygui/TestNiftyGui.java
@@ -41,8 +41,7 @@ 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.util.logging.Level;
-import java.util.logging.Logger;
+import java.net.URL;
 
 public class TestNiftyGui extends SimpleApplication implements ScreenController {
 
@@ -68,7 +67,9 @@ public class TestNiftyGui extends SimpleApplication implements ScreenController
                                                           guiViewPort);
         nifty = niftyDisplay.getNifty();
 
-        nifty.fromXml("Tests/hellojme.xml", "start", this);
+        URL url = Thread.currentThread().getContextClassLoader().getResource("jme3test/niftygui/hellojme.xml");
+        
+        nifty.fromXml("Interface/Nifty/HelloJme.xml", "start", this);
 
         // attach the nifty display to the gui view port as a processor
         guiViewPort.addProcessor(niftyDisplay);
diff --git a/engine/src/test/jme3test/niftygui/hellojme.xml b/engine/src/test/jme3test/niftygui/hellojme.xml
deleted file mode 100644
index c945de6e2..000000000
--- a/engine/src/test/jme3test/niftygui/hellojme.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nifty>
-  <screen id="start" controller="jme3test.niftygui.TestNiftyGui">
-    <layer id="layer" backgroundColor="#0000" childLayout="center">
-      <panel id="panel" height="25%" width="35%" align="center" valign="center" backgroundColor="#f60f" childLayout="center" visibleToMouse="true">
-        <interact onClick="quit()"/>
-        <effect>
-          <onStartScreen name="move" mode="in" direction="top" length="300" startDelay="0" inherit="true"/>
-          <onEndScreen name="move" mode="out" direction="bottom" length="300" startDelay="0" inherit="true"/>
-          <onHover name="pulsate" scaleFactor="0.008" startColor="#f600" endColor="#ffff" post="true"/>
-        </effect>
-        <text id="text" font="aurulent-sans-16.fnt" color="#000f" text="Hello from jME3" align="center" valign="center" />
-      </panel>
-    </layer>
-  </screen>
-  <screen id="end">
-  </screen>
-</nifty>