--- old/core/JemmyAWTInput/test/org/jemmy/operators/ScreenTest.java	2019-03-06 17:23:47.000000000 -0800
+++ /dev/null	2019-03-06 17:23:47.000000000 -0800
@@ -1,77 +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.operators;
-
-import org.jemmy.Point;
-import org.jemmy.env.*;
-import org.jemmy.Rectangle;
-import org.jemmy.control.Wrap;
-import org.jemmy.input.AWTRobotInputFactory;
-import org.jemmy.operators.Screen;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author shura
- */
-public class ScreenTest {
-
-    public ScreenTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        Environment.getEnvironment().setInputFactory(new AWTRobotInputFactory());
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @BeforeMethod
-    public void setUp() {
-    }
-
-    @AfterMethod
-    public void tearDown() {
-    }
-
-    // TODO add test methods here.
-    // The methods must be annotated with annotation @Test. For example:
-    //
-    @Test
-    public void testMouseMove() {
-        Wrap<?> screen = new AWTScreen(Environment.getEnvironment());
-        screen.mouse().move();
-        screen.mouse().move(new Point(0, 0));
-        screen.mouse().move(new Point(screen.getScreenBounds().width, screen.getScreenBounds().height));
-    }
-
-}
--- /dev/null	2019-03-06 17:23:47.000000000 -0800
+++ new/core/JemmyAWTInput/test/org/jemmy/operators/awt/ScreenTest.java	2019-03-06 17:23:47.000000000 -0800
@@ -0,0 +1,76 @@
+/*
+ * 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.operators.awt;
+
+import org.jemmy.Point;
+import org.jemmy.env.*;
+import org.jemmy.control.Wrap;
+import org.jemmy.input.awt.AWTRobotInputFactory;
+import org.jemmy.operators.awt.AWTScreen;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author shura
+ */
+public class ScreenTest {
+
+    public ScreenTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Environment.getEnvironment().setInputFactory(new AWTRobotInputFactory());
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+    }
+
+    @BeforeMethod
+    public void setUp() {
+    }
+
+    @AfterMethod
+    public void tearDown() {
+    }
+
+    // TODO add test methods here.
+    // The methods must be annotated with annotation @Test. For example:
+    //
+    @Test
+    public void testMouseMove() {
+        Wrap<?> screen = new AWTScreen(Environment.getEnvironment());
+        screen.mouse().move();
+        screen.mouse().move(new Point(0, 0));
+        screen.mouse().move(new Point(screen.getScreenBounds().width, screen.getScreenBounds().height));
+    }
+
+}