diff --git a/needles/desktop_package_tool_authenticate-20180713.json b/needles/desktop_package_tool_authenticate-20180713.json
deleted file mode 100644
index 3e4381ce..00000000
--- a/needles/desktop_package_tool_authenticate-20180713.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 17,
-      "type": "match",
-      "ypos": 522,
-      "width": 88,
-      "xpos": 594
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "desktop_package_tool_authenticate"
-  ]
-}
\ No newline at end of file
diff --git a/needles/desktop_package_tool_authenticate-20180713.png b/needles/desktop_package_tool_authenticate-20180713.png
deleted file mode 100644
index 259bc2cb..00000000
Binary files a/needles/desktop_package_tool_authenticate-20180713.png and /dev/null differ
diff --git a/needles/gnome/desktop_package_tool_authenticate.json b/needles/gnome/desktop_package_tool_authenticate.json
index d6112ca8..3e4381ce 100644
--- a/needles/gnome/desktop_package_tool_authenticate.json
+++ b/needles/gnome/desktop_package_tool_authenticate.json
@@ -1,16 +1,16 @@
-{
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "desktop_package_tool_authenticate"
-  ],
-  "area": [
-    {
-      "xpos": 594,
-      "ypos": 522,
-      "width": 88,
-      "height": 17,
-      "type": "match"
-    }
-  ]
+{
+  "area": [
+    {
+      "height": 17,
+      "type": "match",
+      "ypos": 522,
+      "width": 88,
+      "xpos": 594
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-gnome",
+    "desktop_package_tool_authenticate"
+  ]
 }
\ No newline at end of file
diff --git a/needles/gnome/desktop_package_tool_authenticate.png b/needles/gnome/desktop_package_tool_authenticate.png
index 2c5e3a48..259bc2cb 100644
Binary files a/needles/gnome/desktop_package_tool_authenticate.png and b/needles/gnome/desktop_package_tool_authenticate.png differ
diff --git a/needles/desktop_upgrade_graphical-desktop_package_tool_restart-20180713.json b/needles/gnome/desktop_package_tool_restart.json
similarity index 100%
rename from needles/desktop_upgrade_graphical-desktop_package_tool_restart-20180713.json
rename to needles/gnome/desktop_package_tool_restart.json
diff --git a/needles/desktop_upgrade_graphical-desktop_package_tool_restart-20180713.png b/needles/gnome/desktop_package_tool_restart.png
similarity index 100%
rename from needles/desktop_upgrade_graphical-desktop_package_tool_restart-20180713.png
rename to needles/gnome/desktop_package_tool_restart.png