--- old/modules/base/src/test/java/com/sun/javafx/event/PathChangingDispatcher.java	2015-08-31 10:23:09.637217674 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.event;
-
-import javafx.event.Event;
-import javafx.event.EventDispatchChain;
-import javafx.event.EventDispatcher;
-
-public final class PathChangingDispatcher implements EventDispatcher {
-    private final EventDispatcher prependDispatcher;
-    private final EventDispatcher appendDispatcher;
-    private final int dispatchCount;
-
-    public PathChangingDispatcher(final EventDispatcher prependDispatcher,
-                                  final EventDispatcher appendDispatcher,
-                                  final int dispatchCount) {
-        this.prependDispatcher = prependDispatcher;
-        this.appendDispatcher = appendDispatcher;
-        this.dispatchCount = dispatchCount;
-    }
-
-    @Override
-    public Event dispatchEvent(Event event, EventDispatchChain tail) {
-        if (prependDispatcher != null) {
-            tail = tail.prepend(prependDispatcher);
-        }
-        if (appendDispatcher != null) {
-            tail = tail.append(appendDispatcher);
-        }
-
-        for (int i = 0; i < dispatchCount; ++i) {
-            event = tail.dispatchEvent(event);
-        }
-
-        return event;
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/com/sun/javafx/event/PathChangingDispatcher.java	2015-08-31 10:23:09.497217675 -0400
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2013, 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.com.sun.javafx.event;
+
+import javafx.event.Event;
+import javafx.event.EventDispatchChain;
+import javafx.event.EventDispatcher;
+
+public final class PathChangingDispatcher implements EventDispatcher {
+    private final EventDispatcher prependDispatcher;
+    private final EventDispatcher appendDispatcher;
+    private final int dispatchCount;
+
+    public PathChangingDispatcher(final EventDispatcher prependDispatcher,
+                                  final EventDispatcher appendDispatcher,
+                                  final int dispatchCount) {
+        this.prependDispatcher = prependDispatcher;
+        this.appendDispatcher = appendDispatcher;
+        this.dispatchCount = dispatchCount;
+    }
+
+    @Override
+    public Event dispatchEvent(Event event, EventDispatchChain tail) {
+        if (prependDispatcher != null) {
+            tail = tail.prepend(prependDispatcher);
+        }
+        if (appendDispatcher != null) {
+            tail = tail.append(appendDispatcher);
+        }
+
+        for (int i = 0; i < dispatchCount; ++i) {
+            event = tail.dispatchEvent(event);
+        }
+
+        return event;
+    }
+}