--- old/modules/graphics/src/test/java/javafx/scene/shape/Shape3D_properties_Test.java	2015-09-11 21:28:28.893284242 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package javafx.scene.shape;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import com.sun.javafx.test.PropertiesTestBase;
-import javafx.scene.paint.PhongMaterial;
-
-@RunWith(Parameterized.class)
-public final class Shape3D_properties_Test extends PropertiesTestBase {
-
-    @Parameters
-    public static Collection data() {
-        ArrayList array = new ArrayList();
-
-        // simple property tests
-        Shape3D testShape = createTestBox();
-        PhongMaterial DEFAULT_MATERIAL = new PhongMaterial();
-
-        array.add(config(testShape, "cullFace", CullFace.BACK, CullFace.FRONT));
-        array.add(config(testShape, "drawMode", DrawMode.FILL, DrawMode.LINE));
-        array.add(config(testShape, "material", DEFAULT_MATERIAL, null));
-
-        return array;
-    }
-
-    public Shape3D_properties_Test(final Configuration configuration) {
-        super(configuration);
-    }
-
-    private static Box createTestBox() {
-        Box b = new Box(10, 10, 10);
-        return b;
-    }
-
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/shape/Shape3D_properties_Test.java	2015-09-11 21:28:28.757284244 -0400
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.javafx.scene.shape;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import test.com.sun.javafx.test.PropertiesTestBase;
+import javafx.scene.paint.PhongMaterial;
+import javafx.scene.shape.Box;
+import javafx.scene.shape.CullFace;
+import javafx.scene.shape.DrawMode;
+import javafx.scene.shape.Shape3D;
+
+@RunWith(Parameterized.class)
+public final class Shape3D_properties_Test extends PropertiesTestBase {
+
+    @Parameters
+    public static Collection data() {
+        ArrayList array = new ArrayList();
+
+        // simple property tests
+        Shape3D testShape = createTestBox();
+        PhongMaterial DEFAULT_MATERIAL = new PhongMaterial();
+
+        array.add(config(testShape, "cullFace", CullFace.BACK, CullFace.FRONT));
+        array.add(config(testShape, "drawMode", DrawMode.FILL, DrawMode.LINE));
+        array.add(config(testShape, "material", DEFAULT_MATERIAL, null));
+
+        return array;
+    }
+
+    public Shape3D_properties_Test(final Configuration configuration) {
+        super(configuration);
+    }
+
+    private static Box createTestBox() {
+        Box b = new Box(10, 10, 10);
+        return b;
+    }
+
+}