--- old/core/JemmyAWTInput/src/org/jemmy/image/PNGImageSaver.java	2019-03-06 17:23:14.000000000 -0800
+++ /dev/null	2019-03-06 17:23:14.000000000 -0800
@@ -1,55 +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.awt.image.BufferedImage;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-
-/**
- * Allows to process PNG image format.
- *
- * @author Alexandre Iline (alexandre.iline@sun.com)
- */
-class PNGImageSaver {
-
-    /**
-     * Saves an image into a PNG image file.
-     * @throws IOException
-     */
-    public void save(BufferedImage image, String fileName) throws IOException{
-        File f = new File(fileName);
-        File parent = f.getParentFile();
-        if (parent != null) {
-            parent.mkdirs();
-        }
-        new PNGEncoder(new BufferedOutputStream(new FileOutputStream(f)),
-                       PNGEncoder.COLOR_MODE).encode(image);
-    }
-}
--- /dev/null	2019-03-06 17:23:14.000000000 -0800
+++ new/core/JemmyAWTInput/src/org/jemmy/image/awt/PNGImageSaver.java	2019-03-06 17:23:14.000000000 -0800
@@ -0,0 +1,55 @@
+/*
+ * 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.awt.image.BufferedImage;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+
+/**
+ * Allows to process PNG image format.
+ *
+ * @author Alexandre Iline (alexandre.iline@sun.com)
+ */
+class PNGImageSaver {
+
+    /**
+     * Saves an image into a PNG image file.
+     * @throws IOException
+     */
+    public void save(BufferedImage image, String fileName) throws IOException{
+        File f = new File(fileName);
+        File parent = f.getParentFile();
+        if (parent != null) {
+            parent.mkdirs();
+        }
+        new PNGEncoder(new BufferedOutputStream(new FileOutputStream(f)),
+                       PNGEncoder.COLOR_MODE).encode(image);
+    }
+}