--- old/modules/javafx.graphics/src/test/java/javafx/concurrent/ServiceShim.java	2016-11-02 13:32:04.219909192 -0400
+++ /dev/null	2016-10-31 09:37:02.128008072 -0400
@@ -1,60 +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 javafx.concurrent;
-
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-
-public abstract class ServiceShim<V>  extends Service<V>  {
-
-    public static void fireEvent(Service s, Event event) {
-        s.fireEvent(event);
-    }
-
-    public static <T extends Event> void setEventHandler(Service s,
-            final EventType<T> eventType,
-            final EventHandler<? super T> eventHandler) {
-        s.setEventHandler(eventType, eventHandler);
-    }
-
-    //-----------------------------------
-
-    @Override
-    public void runLater(Runnable r) {
-        super.runLater(r);
-    }
-
-    @Override
-    public boolean isFxApplicationThread() {
-        return super.isFxApplicationThread();
-    }
-
-    @Override
-    public void checkThread()  {
-        super.checkThread();
-    }
-
-}
--- /dev/null	2016-10-31 09:37:02.128008072 -0400
+++ new/modules/javafx.graphics/src/shims/java/javafx/concurrent/ServiceShim.java	2016-11-02 13:32:04.063912736 -0400
@@ -0,0 +1,60 @@
+/*
+ * 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 javafx.concurrent;
+
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+
+public abstract class ServiceShim<V>  extends Service<V>  {
+
+    public static void fireEvent(Service s, Event event) {
+        s.fireEvent(event);
+    }
+
+    public static <T extends Event> void setEventHandler(Service s,
+            final EventType<T> eventType,
+            final EventHandler<? super T> eventHandler) {
+        s.setEventHandler(eventType, eventHandler);
+    }
+
+    //-----------------------------------
+
+    @Override
+    public void runLater(Runnable r) {
+        super.runLater(r);
+    }
+
+    @Override
+    public boolean isFxApplicationThread() {
+        return super.isFxApplicationThread();
+    }
+
+    @Override
+    public void checkThread()  {
+        super.checkThread();
+    }
+
+}