--- old/core/JemmyAWTInput/test/org/jemmy/image/InitTest.java	2019-03-06 17:23:31.000000000 -0800
+++ /dev/null	2019-03-06 17:23:31.000000000 -0800
@@ -1,68 +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 java.io.IOException;
-import org.jemmy.env.Environment;
-import org.jemmy.image.pixel.MaxDistanceComparator;
-import org.jemmy.image.pixel.PixelEqualityRasterComparator;
-import org.jemmy.operators.AWTScreen;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-/**
- *
- * @author shura
- */
-public class InitTest {
-
-    public InitTest() {
-    }
-
-    @BeforeClass
-    public static void setup() throws InterruptedException, IOException {
-    }
-
-    @Test
-    public void testImage() {
-        Environment.getEnvironment().setProperty(ImageCapturer.class, new AWTRobotCapturer());
-        Image i = new AWTScreen().getScreenImage();
-        assertTrue(i instanceof AWTImage);
-        assertNull(i.compareTo(i));
-    }
-
-    @Test
-    public void testComparator() {
-        Environment.getEnvironment().setProperty(ImageCapturer.class, new AWTRobotCapturer());
-        ImageComparator comp = Environment.getEnvironment().getProperty(ImageComparator.class);
-        System.out.println("comp = " + comp);
-        assertTrue(comp instanceof BufferedImageComparator);
-        assertTrue(((BufferedImageComparator)comp).getRasterComparator() instanceof PixelEqualityRasterComparator);
-    }
-
-}
--- /dev/null	2019-03-06 17:23:31.000000000 -0800
+++ new/core/JemmyAWTInput/test/org/jemmy/image/awt/InitTest.java	2019-03-06 17:23:31.000000000 -0800
@@ -0,0 +1,73 @@
+/*
+ * 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 java.io.IOException;
+import org.jemmy.env.Environment;
+import org.jemmy.image.Image;
+import org.jemmy.image.ImageCapturer;
+import org.jemmy.image.ImageComparator;
+import org.jemmy.image.awt.AWTImage;
+import org.jemmy.image.awt.AWTRobotCapturer;
+import org.jemmy.image.awt.BufferedImageComparator;
+import org.jemmy.image.pixel.PixelEqualityRasterComparator;
+import org.jemmy.operators.awt.AWTScreen;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ *
+ * @author shura
+ */
+public class InitTest {
+
+    public InitTest() {
+    }
+
+    @BeforeClass
+    public static void setup() throws InterruptedException, IOException {
+    }
+
+    @Test
+    public void testImage() {
+        Environment.getEnvironment().setProperty(ImageCapturer.class, new AWTRobotCapturer());
+        Image i = new AWTScreen().getScreenImage();
+        assertTrue(i instanceof AWTImage);
+        assertNull(i.compareTo(i));
+    }
+
+    @Test
+    public void testComparator() {
+        Environment.getEnvironment().setProperty(ImageCapturer.class, new AWTRobotCapturer());
+        ImageComparator comp = Environment.getEnvironment().getProperty(ImageComparator.class);
+        System.out.println("comp = " + comp);
+        assertTrue(comp instanceof BufferedImageComparator);
+        assertTrue(((BufferedImageComparator)comp).getRasterComparator() instanceof PixelEqualityRasterComparator);
+    }
+
+}