diff --git a/PluginDirectories/1/wunderlist.bundle/3.version b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/3.version
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/3.version
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/3.version
diff --git a/PluginDirectories/1/wunderlist.bundle/examples.txt b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/examples.txt
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/examples.txt
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/examples.txt
diff --git a/PluginDirectories/1/wunderlist.bundle/info.json b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/info.json
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/info.json
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/info.json
diff --git a/PluginDirectories/1/wunderlist.bundle/options.json b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/options.json
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/options.json
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/options.json
diff --git a/PluginDirectories/1/wunderlist.bundle/plugin.py b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/plugin.py
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/plugin.py
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/plugin.py
diff --git a/PluginDirectories/1/wunderlist.bundle/preferences.json b/PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/preferences.json
similarity index 100%
rename from PluginDirectories/1/wunderlist.bundle/preferences.json
rename to PluginDirectories/1/NoLongerWorking/Wunderlist.bundle/preferences.json
diff --git a/PluginDirectories/1/ccgenerator.bundle/1.version b/PluginDirectories/1/ccgenerator.bundle/1.version
new file mode 100644
index 00000000..9b74d6d6
--- /dev/null
+++ b/PluginDirectories/1/ccgenerator.bundle/1.version
@@ -0,0 +1 @@
+fadc1e1f2625933cea769e0994361f1543313e4b92d6b878d1b1918ab4ee8311
\ No newline at end of file
diff --git a/PluginDirectories/1/index.json b/PluginDirectories/1/index.json
index c9d6836e..0daa765a 100644
--- a/PluginDirectories/1/index.json
+++ b/PluginDirectories/1/index.json
@@ -289,6 +289,26 @@
             "name": "CanIUse",
             "zip_url": "CanIUse.zip"
         },
+        {
+            "categories": [
+                "Developer"
+            ],
+            "creator_name": "Guilherme Ara\u00fajo",
+            "creator_url": "http://www.github.com/guilhermearaujo",
+            "description": "Generates a valid credit card number",
+            "displayName": "Credit Card Generator",
+            "examples": [
+                "visa",
+                "mastercard",
+                "amex",
+                "diners",
+                "jcb",
+                "discover",
+                "hipercard"
+            ],
+            "name": "ccgenerator",
+            "zip_url": "ccgenerator.zip"
+        },
         {
             "categories": [
                 "Developer"
@@ -1691,6 +1711,16 @@
             "name": "terminal",
             "zip_url": "terminal.zip"
         },
+        {
+            "description": "Search Thingiverse for 3D printable models",
+            "displayName": "Thingiverse",
+            "examples": [
+                "thing extruder upgrade",
+                "t wall plate customizer"
+            ],
+            "name": "thing",
+            "zip_url": "thing.zip"
+        },
         {
             "categories": [
                 "Developer"
@@ -2000,19 +2030,6 @@
             "name": "wolfram-alpha",
             "zip_url": "wolfram-alpha.zip"
         },
-        {
-            "categories": [
-                "Utilities"
-            ],
-            "description": "Create a new task in Wunderlist",
-            "displayName": "Task to Wunderlist",
-            "examples": [
-                "wunderlist do the dishes",
-                "wunderlist call mom"
-            ],
-            "name": "Wunderlist",
-            "zip_url": "Wunderlist.zip"
-        },
         {
             "categories": [
                 "Developer"
diff --git a/PluginDirectories/1/remind-me.bundle/2.version b/PluginDirectories/1/remind-me.bundle/2.version
deleted file mode 100644
index 07eb219f..00000000
--- a/PluginDirectories/1/remind-me.bundle/2.version
+++ /dev/null
@@ -1 +0,0 @@
-10fd044e05ca603e23ac0ed68a328d4199afd7d8bca85979202aaa1b246cc40a
\ No newline at end of file
diff --git a/PluginDirectories/1/remind-me.bundle/3.version b/PluginDirectories/1/remind-me.bundle/3.version
new file mode 100644
index 00000000..6fe70ebc
--- /dev/null
+++ b/PluginDirectories/1/remind-me.bundle/3.version
@@ -0,0 +1 @@
+45dc17a5d07c2977eee35c322b519e5329d5afd610e3e86d4061bd6c86934475
\ No newline at end of file
diff --git a/PluginDirectories/1/thing.bundle/1.version b/PluginDirectories/1/thing.bundle/1.version
new file mode 100644
index 00000000..efeb49d5
--- /dev/null
+++ b/PluginDirectories/1/thing.bundle/1.version
@@ -0,0 +1 @@
+ed94ec3f7cdea11c36cc15453bf78fc4ca397ed1ca5ffb8ccecdc642ad340989
\ No newline at end of file
diff --git a/PluginDirectories/1/thing.bundle/info.json b/PluginDirectories/1/thing.bundle/info.json
index 5ed69550..ef332ee3 100755
--- a/PluginDirectories/1/thing.bundle/info.json
+++ b/PluginDirectories/1/thing.bundle/info.json
@@ -1,5 +1,5 @@
 {
-	"name": "Thingiverse",
+	"name": "thing",
 	"displayName": "Thingiverse",
 	"description": "Search Thingiverse for 3D printable models",
 	"examples": ["thing extruder upgrade", "t wall plate customizer"]