--- old/core/JemmyAWTInput/src/org/jemmy/image/Utils.java	2019-03-06 17:23:18.000000000 -0800
+++ /dev/null	2019-03-06 17:23:18.000000000 -0800
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2007, 2017, 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 org.jemmy.image;
-
-
-import org.jemmy.Dimension;
-import org.jemmy.Point;
-import org.jemmy.Rectangle;
-
-
-/**
- *
- * @author mrkam
- */
-public class Utils {
-
-    public static java.awt.Rectangle convert(Rectangle r) {
-        return new java.awt.Rectangle(r.x, r.y, r.width, r.height);
-    }
-
-    public static Rectangle convert(java.awt.Rectangle r) {
-        return new Rectangle(r.x, r.y, r.width, r.height);
-    }
-
-    public static java.awt.Point convert(Point p) {
-        return new java.awt.Point(p.x, p.y);
-    }
-
-    public static Point convert(java.awt.Point p) {
-        return new Point(p.x, p.y);
-    }
-
-    public static java.awt.Dimension convert(Dimension d) {
-        return new java.awt.Dimension(d.width, d.height);
-    }
-
-    public static Dimension convert(java.awt.Dimension d) {
-        return new Dimension(d.width, d.height);
-    }
-
-}
--- /dev/null	2019-03-06 17:23:18.000000000 -0800
+++ new/core/JemmyAWTInput/src/org/jemmy/image/awt/Utils.java	2019-03-06 17:23:18.000000000 -0800
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2007, 2017, 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 org.jemmy.image.awt;
+
+
+import org.jemmy.Dimension;
+import org.jemmy.Point;
+import org.jemmy.Rectangle;
+
+
+/**
+ *
+ * @author mrkam
+ */
+public class Utils {
+
+    public static java.awt.Rectangle convert(Rectangle r) {
+        return new java.awt.Rectangle(r.x, r.y, r.width, r.height);
+    }
+
+    public static Rectangle convert(java.awt.Rectangle r) {
+        return new Rectangle(r.x, r.y, r.width, r.height);
+    }
+
+    public static java.awt.Point convert(Point p) {
+        return new java.awt.Point(p.x, p.y);
+    }
+
+    public static Point convert(java.awt.Point p) {
+        return new Point(p.x, p.y);
+    }
+
+    public static java.awt.Dimension convert(Dimension d) {
+        return new java.awt.Dimension(d.width, d.height);
+    }
+
+    public static Dimension convert(java.awt.Dimension d) {
+        return new Dimension(d.width, d.height);
+    }
+
+}