diff --git a/editions/tw2/tiddlywiki.info b/editions/tw2/tiddlywiki.info
index 13d157292..0fa65c9f1 100644
--- a/editions/tw2/tiddlywiki.info
+++ b/editions/tw2/tiddlywiki.info
@@ -1,6 +1,5 @@
 {
 	"plugins": [
-		"tiddlywiki/loadrecipe",
-		"tiddlywiki/stripcomments"
+		"tiddlywiki/classictools"
 	]
 }
\ No newline at end of file
diff --git a/plugins/tiddlywiki/loadrecipe/recipe.js b/plugins/tiddlywiki/classictools/modules/recipe.js
similarity index 97%
rename from plugins/tiddlywiki/loadrecipe/recipe.js
rename to plugins/tiddlywiki/classictools/modules/recipe.js
index ac7005338..836356ca0 100644
--- a/plugins/tiddlywiki/loadrecipe/recipe.js
+++ b/plugins/tiddlywiki/classictools/modules/recipe.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki2/loadrecipe/recipe.js
+title: $:/plugins/tiddlywiki/classictools/recipe.js
 type: application/javascript
 module-type: tiddlerdeserializer
 
diff --git a/plugins/tiddlywiki/stripcomments/stripcomments.js b/plugins/tiddlywiki/classictools/modules/stripcomments.js
similarity index 95%
rename from plugins/tiddlywiki/stripcomments/stripcomments.js
rename to plugins/tiddlywiki/classictools/modules/stripcomments.js
index b6f0cda13..956649f53 100644
--- a/plugins/tiddlywiki/stripcomments/stripcomments.js
+++ b/plugins/tiddlywiki/classictools/modules/stripcomments.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki2/stripcomments/stripcomments.js
+title: $:/plugins/tiddlywiki/classictools/stripcomments.js
 type: application/javascript
 module-type: fieldviewer
 
diff --git a/plugins/tiddlywiki/classictools/plugin.info b/plugins/tiddlywiki/classictools/plugin.info
new file mode 100644
index 000000000..cf651eaa9
--- /dev/null
+++ b/plugins/tiddlywiki/classictools/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/classictools",
+	"description": "Tools for working with classic TiddlyWiki documents",
+	"author": "JeremyRuston",
+	"version": "0.0.0",
+	"core-version": ">=5.0.0"
+}
diff --git a/editions/tw2/tiddlers/system/html-div-tiddler-remove-prefix.tid b/plugins/tiddlywiki/classictools/templates/html-div-tiddler-remove-prefix.tid
similarity index 100%
rename from editions/tw2/tiddlers/system/html-div-tiddler-remove-prefix.tid
rename to plugins/tiddlywiki/classictools/templates/html-div-tiddler-remove-prefix.tid
diff --git a/editions/tw2/tiddlers/system/plain-text-tiddler-strip-comments.tid b/plugins/tiddlywiki/classictools/templates/plain-text-tiddler-strip-comments.tid
similarity index 100%
rename from editions/tw2/tiddlers/system/plain-text-tiddler-strip-comments.tid
rename to plugins/tiddlywiki/classictools/templates/plain-text-tiddler-strip-comments.tid
diff --git a/editions/tw2/tiddlers/system/tiddlywiki2.externaljs.template.html.tid b/plugins/tiddlywiki/classictools/templates/tiddlywiki2.externaljs.template.html.tid
similarity index 100%
rename from editions/tw2/tiddlers/system/tiddlywiki2.externaljs.template.html.tid
rename to plugins/tiddlywiki/classictools/templates/tiddlywiki2.externaljs.template.html.tid
diff --git a/editions/tw2/tiddlers/system/tiddlywiki2.template.html.tid b/plugins/tiddlywiki/classictools/templates/tiddlywiki2.template.html.tid
similarity index 100%
rename from editions/tw2/tiddlers/system/tiddlywiki2.template.html.tid
rename to plugins/tiddlywiki/classictools/templates/tiddlywiki2.template.html.tid
diff --git a/plugins/tiddlywiki/loadrecipe/plugin.info b/plugins/tiddlywiki/loadrecipe/plugin.info
deleted file mode 100644
index 222c56ef4..000000000
--- a/plugins/tiddlywiki/loadrecipe/plugin.info
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"title": "$:/plugins/tiddlywiki2/loadrecipe",
-	"description": "Loads tiddlers from an old-style TiddlyWiki 2.x.x recipe file",
-	"author": "JeremyRuston",
-	"version": "0.0.0",
-	"core-version": ">=5.0.0"
-}
diff --git a/plugins/tiddlywiki/stripcomments/plugin.info b/plugins/tiddlywiki/stripcomments/plugin.info
deleted file mode 100644
index 4827a52ce..000000000
--- a/plugins/tiddlywiki/stripcomments/plugin.info
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"title": "$:/plugins/tiddlywiki2/stripcomments",
-	"description": "Strips //# comments from JavaScript source",
-	"author": "JeremyRuston",
-	"version": "0.0.0",
-	"core-version": ">=5.0.0"
-}