--- old/modules/javafx.graphics/src/test/java/com/sun/javafx/sg/prism/NGCircleShim.java	2016-11-02 13:31:57.208068502 -0400
+++ /dev/null	2016-10-31 09:37:02.128008072 -0400
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015, 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 com.sun.javafx.sg.prism;
-
-import com.sun.javafx.geom.DirtyRegionContainer;
-import com.sun.javafx.geom.DirtyRegionPool;
-import com.sun.javafx.geom.RectBounds;
-import com.sun.javafx.geom.transform.BaseTransform;
-import com.sun.javafx.geom.transform.GeneralTransform3D;
-
-public class NGCircleShim extends NGCircle {
-
-    @Override
-    public int accumulateGroupDirtyRegion(
-            final RectBounds clip,
-            final RectBounds dirtyRegionTemp,
-            final DirtyRegionPool regionPool,
-            DirtyRegionContainer dirtyRegionContainer,
-            final BaseTransform tx,
-            final GeneralTransform3D pvTx) {
-        return super.accumulateGroupDirtyRegion(clip, dirtyRegionTemp,
-                regionPool, dirtyRegionContainer, tx, pvTx);
-    }
-
-    @Override
-    public int accumulateNodeDirtyRegion(final RectBounds clip,
-                                  final RectBounds dirtyRegionTemp,
-                                  final DirtyRegionContainer dirtyRegionContainer,
-                                  final BaseTransform tx,
-                                  final GeneralTransform3D pvTx) {
-        return super.accumulateNodeDirtyRegion(clip, dirtyRegionTemp,
-                dirtyRegionContainer, tx, pvTx);
-    }
-
-}
--- /dev/null	2016-10-31 09:37:02.128008072 -0400
+++ new/modules/javafx.graphics/src/shims/java/com/sun/javafx/sg/prism/NGCircleShim.java	2016-11-02 13:31:57.056071956 -0400
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015, 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 com.sun.javafx.sg.prism;
+
+import com.sun.javafx.geom.DirtyRegionContainer;
+import com.sun.javafx.geom.DirtyRegionPool;
+import com.sun.javafx.geom.RectBounds;
+import com.sun.javafx.geom.transform.BaseTransform;
+import com.sun.javafx.geom.transform.GeneralTransform3D;
+
+public class NGCircleShim extends NGCircle {
+
+    @Override
+    public int accumulateGroupDirtyRegion(
+            final RectBounds clip,
+            final RectBounds dirtyRegionTemp,
+            final DirtyRegionPool regionPool,
+            DirtyRegionContainer dirtyRegionContainer,
+            final BaseTransform tx,
+            final GeneralTransform3D pvTx) {
+        return super.accumulateGroupDirtyRegion(clip, dirtyRegionTemp,
+                regionPool, dirtyRegionContainer, tx, pvTx);
+    }
+
+    @Override
+    public int accumulateNodeDirtyRegion(final RectBounds clip,
+                                  final RectBounds dirtyRegionTemp,
+                                  final DirtyRegionContainer dirtyRegionContainer,
+                                  final BaseTransform tx,
+                                  final GeneralTransform3D pvTx) {
+        return super.accumulateNodeDirtyRegion(clip, dirtyRegionTemp,
+                dirtyRegionContainer, tx, pvTx);
+    }
+
+}