diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid
deleted file mode 100644
index 55420387a..000000000
--- a/core/language/en-GB/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO icon
-name: image/x-icon
-group: Image
-group-sort: 1
diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
new file mode 100644
index 000000000..4fb3f2ec1
--- /dev/null
+++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid
@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
+description: TiddlyWiki 5 compound tiddler
+name: text/vnd.tiddlywiki-multiple
+group: Developer
+group-sort: 2
diff --git a/languages/ca-ES/Types/image%2Fx-icon.tid b/languages/ca-ES/Types/image%2Fx-icon.tid
deleted file mode 100644
index ba79c8f76..000000000
--- a/languages/ca-ES/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Format de fitxer d'icona ICO
-name: image/x-icon
-group: Imatge
diff --git a/languages/cs-CZ/Types/image%2Fx-icon.tid b/languages/cs-CZ/Types/image%2Fx-icon.tid
deleted file mode 100644
index ff8d12f81..000000000
--- a/languages/cs-CZ/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO format icon file
-name: image/x-icon
-group: Image
diff --git a/languages/da-DK/Types/image%2Fx-icon.tid b/languages/da-DK/Types/image%2Fx-icon.tid
deleted file mode 100644
index 7dd30a011..000000000
--- a/languages/da-DK/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO ikon fil
-name: image/x-icon
-group: Billede
diff --git a/languages/de-DE/Types/application_javascript.tid b/languages/de-DE/Types/application_javascript.tid
index 5d8355058..894a8f727 100644
--- a/languages/de-DE/Types/application_javascript.tid
+++ b/languages/de-DE/Types/application_javascript.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/javascript
 description: JS - JavaScript Code
 name: application/javascript
 group: Entwickler
+group-sort: 2
diff --git a/languages/de-DE/Types/application_json.tid b/languages/de-DE/Types/application_json.tid
index 07599cf57..c1768b93f 100644
--- a/languages/de-DE/Types/application_json.tid
+++ b/languages/de-DE/Types/application_json.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/json
 description: JSON - Daten
 name: application/json
 group: Entwickler
+group-sort: 2
diff --git a/languages/de-DE/Types/application_x_tiddler_dictionary.tid b/languages/de-DE/Types/application_x_tiddler_dictionary.tid
index 0eeb94feb..97ba09970 100644
--- a/languages/de-DE/Types/application_x_tiddler_dictionary.tid
+++ b/languages/de-DE/Types/application_x_tiddler_dictionary.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary
 description: TiddlyWiki Datenkatalog
 name: application/x-tiddler-dictionary
 group: Entwickler
+group-sort: 2
diff --git a/languages/de-DE/Types/image_gif.tid b/languages/de-DE/Types/image_gif.tid
index cadd49999..a214a46b6 100644
--- a/languages/de-DE/Types/image_gif.tid
+++ b/languages/de-DE/Types/image_gif.tid
@@ -1,4 +1,5 @@
 title: $:/language/Docs/Types/image/gif
 description: GIF - Bild
 name: image/gif
-group: Bilder
\ No newline at end of file
+group: Bilder
+group-sort: 1
\ No newline at end of file
diff --git a/languages/de-DE/Types/image_jpeg.tid b/languages/de-DE/Types/image_jpeg.tid
index 2a0c59998..15b3ec725 100644
--- a/languages/de-DE/Types/image_jpeg.tid
+++ b/languages/de-DE/Types/image_jpeg.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/jpeg
 description: JPEG - Bild
 name: image/jpeg
 group: Bilder
+group-sort: 1
diff --git a/languages/de-DE/Types/image_png.tid b/languages/de-DE/Types/image_png.tid
index 1f330eff1..140b669f3 100644
--- a/languages/de-DE/Types/image_png.tid
+++ b/languages/de-DE/Types/image_png.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/png
 description: PNG - Portable Netzwerkgrafik
 name: image/png
 group: Bilder
+group-sort: 1
diff --git a/languages/de-DE/Types/image_svg_xml.tid b/languages/de-DE/Types/image_svg_xml.tid
index 6a008c87f..ab9ee72ec 100644
--- a/languages/de-DE/Types/image_svg_xml.tid
+++ b/languages/de-DE/Types/image_svg_xml.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/svg+xml
 description: SVG - Strukturierte Vektor Graphik
 name: image/svg+xml
 group: Bilder
+group-sort: 1
diff --git a/languages/de-DE/Types/image_x-icon.tid b/languages/de-DE/Types/image_x-icon.tid
deleted file mode 100644
index 043071d97..000000000
--- a/languages/de-DE/Types/image_x-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO - Piktogramm (Icon)
-name: image/x-icon
-group: Bilder
diff --git a/languages/de-DE/Types/text_css.tid b/languages/de-DE/Types/text_css.tid
index 0ac501127..95038c03c 100644
--- a/languages/de-DE/Types/text_css.tid
+++ b/languages/de-DE/Types/text_css.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/css
 description: CSS - Cascading Style Sheets
 name: text/css
 group: Entwickler
+group-sort: 2
diff --git a/languages/de-DE/Types/text_html.tid b/languages/de-DE/Types/text_html.tid
index a94db47c4..974920715 100644
--- a/languages/de-DE/Types/text_html.tid
+++ b/languages/de-DE/Types/text_html.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/html
 description: HTML - Auszeichnungssprache
 name: text/html
 group: Text
+group-sort: 0
\ No newline at end of file
diff --git a/languages/de-DE/Types/text_plain.tid b/languages/de-DE/Types/text_plain.tid
index 8246411ba..d1e96034c 100644
--- a/languages/de-DE/Types/text_plain.tid
+++ b/languages/de-DE/Types/text_plain.tid
@@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/plain
 description: TXT - Unformatierter Text
 name: text/plain
 group: Text
+group-sort: 0
\ No newline at end of file
diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki.tid b/languages/de-DE/Types/text_vnd.tiddlywiki.tid
index fdcc917dd..ec8342a24 100644
--- a/languages/de-DE/Types/text_vnd.tiddlywiki.tid
+++ b/languages/de-DE/Types/text_vnd.tiddlywiki.tid
@@ -1,4 +1,5 @@
 title: $:/language/Docs/Types/text/vnd.tiddlywiki
-description: TW5 - TiddlyWiki Version 5 Wikitext
+description: TW5 - TiddlyWiki Wikitext
 name: text/vnd.tiddlywiki
 group: Text
+group-sort: 0
\ No newline at end of file
diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid
new file mode 100644
index 000000000..2c192f96f
--- /dev/null
+++ b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid
@@ -0,0 +1,5 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple
+description: TW5 - TiddlyWiki Wikitext Verbund Tiddler
+name: text/vnd.tiddlywiki-multiple
+group: Entwickler
+group-sort: 2
diff --git a/languages/el-GR/Types/image%2Fx-icon.tid b/languages/el-GR/Types/image%2Fx-icon.tid
deleted file mode 100644
index 43fc68aeb..000000000
--- a/languages/el-GR/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Αρχείο Εικονιδίου μορφής ICO
-name: image/x-icon
-group: Εικόνας
diff --git a/languages/es-ES/Types/image_x-icon.tid b/languages/es-ES/Types/image_x-icon.tid
deleted file mode 100644
index 9a3574bca..000000000
--- a/languages/es-ES/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Archivo de icono en formato .ICO
-name: image/x-icon
-group: Imagen
-group-sort: 1
diff --git a/languages/fr-FR/Types/image_x-icon.tid b/languages/fr-FR/Types/image_x-icon.tid
deleted file mode 100644
index 15f41cb65..000000000
--- a/languages/fr-FR/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: icône au format ICO
-name: image/x-icon
-group: Image
-group-sort: 1
diff --git a/languages/he-IL/Types/image%2Fx-icon.tid b/languages/he-IL/Types/image%2Fx-icon.tid
deleted file mode 100644
index 55a37c04a..000000000
--- a/languages/he-IL/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO format קובץ סמליל
-name: image/x-icon
-group: תמונה
diff --git a/languages/hi-IN/Types/image%2Fx-icon.tid b/languages/hi-IN/Types/image%2Fx-icon.tid
deleted file mode 100644
index 2f2ec7b8e..000000000
--- a/languages/hi-IN/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO के प्रारूप आइकन फ़ाइल
-name: image/x-icon
-group: 
- छवि 
diff --git a/languages/ia-IA/Types/image%2Fx-icon.tid b/languages/ia-IA/Types/image%2Fx-icon.tid
deleted file mode 100644
index d5057ea68..000000000
--- a/languages/ia-IA/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: File de formato de icones ICO
-name: image/x-icon
-group: Imagine
diff --git a/languages/it-IT/Types/image_x-icon.tid b/languages/it-IT/Types/image_x-icon.tid
deleted file mode 100644
index f0c922f95..000000000
--- a/languages/it-IT/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: File icona ICO
-name: image/x-icon
-group: Immagine
-group-sort: 1
diff --git a/languages/ja-JP/Types/image%2Fx-icon.tid b/languages/ja-JP/Types/image%2Fx-icon.tid
deleted file mode 100644
index 9baa98ea8..000000000
--- a/languages/ja-JP/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: アイコンファイル（ICO 形式）
-name: image/x-icon
-group: Image
diff --git a/languages/ko-KR/Types/image%2Fx-icon.tid b/languages/ko-KR/Types/image%2Fx-icon.tid
deleted file mode 100644
index c0708db36..000000000
--- a/languages/ko-KR/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO 형식 아이콘 파일
-name: image/x-icon
-group: 그림
diff --git a/languages/mk-MK/Types/image%2Fx-icon.tid b/languages/mk-MK/Types/image%2Fx-icon.tid
deleted file mode 100644
index 0f28bb5b8..000000000
--- a/languages/mk-MK/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO икона
-name: image/x-icon
-group: Фотографија
diff --git a/languages/nl-NL/Types/image%2Fx-icon.tid b/languages/nl-NL/Types/image%2Fx-icon.tid
deleted file mode 100644
index 5cfa06148..000000000
--- a/languages/nl-NL/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO pictogram (icon)
-name: image/x-icon
-group: Afbeelding
diff --git a/languages/pa-IN/Types/image%2Fx-icon.tid b/languages/pa-IN/Types/image%2Fx-icon.tid
deleted file mode 100644
index dfee8dc3d..000000000
--- a/languages/pa-IN/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO ਫਾਰਮੈਟ ਆਈਕਾਨ ਫਾਇਲ
-name: image/x-icon
-group: ਚਿੱਤਰ
diff --git a/languages/pl-PL/Types/image_x-icon.tid b/languages/pl-PL/Types/image_x-icon.tid
deleted file mode 100644
index 624000820..000000000
--- a/languages/pl-PL/Types/image_x-icon.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Ikona w formacie ICO
-name: image/x-icon
-group: Image
-group-sort: 1
diff --git a/languages/pt-BR/Types/image%2Fx-icon.tid b/languages/pt-BR/Types/image%2Fx-icon.tid
deleted file mode 100644
index 2cbf89338..000000000
--- a/languages/pt-BR/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Ícone em formato de arquivo ICO
-name: image/x-icon
-group: Imagem
diff --git a/languages/pt-PT/Types/image%2Fx-icon.tid b/languages/pt-PT/Types/image%2Fx-icon.tid
deleted file mode 100644
index 04f08c6e8..000000000
--- a/languages/pt-PT/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Ícone em formato de ficheiro ICO
-name: image/x-icon
-group: Imagem
diff --git a/languages/ru-RU/Types/image%2Fx-icon.tid b/languages/ru-RU/Types/image%2Fx-icon.tid
deleted file mode 100644
index fc268f917..000000000
--- a/languages/ru-RU/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO значок
-name: image/x-icon
-group: Изображение
diff --git a/languages/sk-SK/Types/image%2Fx-icon.tid b/languages/sk-SK/Types/image%2Fx-icon.tid
deleted file mode 100644
index 56695bf3b..000000000
--- a/languages/sk-SK/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO formát pre súbor ikony
-name: image/x-icon
-group: Obrázok
diff --git a/languages/sl-SI/Types/image%2Fx-icon.tid b/languages/sl-SI/Types/image%2Fx-icon.tid
deleted file mode 100644
index 7007c1ac3..000000000
--- a/languages/sl-SI/Types/image%2Fx-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: Datoteka s ikono oblike ICO
-name: image/x-icon
-group: Slika
diff --git a/languages/sv-SE/Types/image_x-icon.tid b/languages/sv-SE/Types/image_x-icon.tid
deleted file mode 100755
index 78ba4e19b..000000000
--- a/languages/sv-SE/Types/image_x-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO ikonfil
-name: image/x-icon
-group: Bild
diff --git a/languages/zh-Hans/Types/image_x-icon.tid b/languages/zh-Hans/Types/image_x-icon.tid
deleted file mode 100644
index a5b5159bc..000000000
--- a/languages/zh-Hans/Types/image_x-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO 图标
-name: image/x-icon
-group: 图像
diff --git a/languages/zh-Hant/Types/image_x-icon.tid b/languages/zh-Hant/Types/image_x-icon.tid
deleted file mode 100644
index 5dd06b877..000000000
--- a/languages/zh-Hant/Types/image_x-icon.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/language/Docs/Types/image/x-icon
-description: ICO 圖示
-name: image/x-icon
-group: 圖片
diff --git a/languages/ca-ES/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/ca-ES/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid
diff --git a/languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid
diff --git a/languages/da-DK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/da-DK/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid
diff --git a/languages/de-DE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/de-DE/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid
diff --git a/languages/el-GR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/el-GR/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid
diff --git a/core/language/en-GB/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid
similarity index 100%
rename from core/language/en-GB/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid
diff --git a/languages/es-ES/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/es-ES/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid
diff --git a/languages/fr-FR/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/fr-FR/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid
diff --git a/languages/he-IL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/he-IL/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid
diff --git a/languages/hi-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/hi-IN/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid
diff --git a/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid
new file mode 100644
index 000000000..802e23ce2
--- /dev/null
+++ b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki Classic
+name: text/x-tiddlywiki
+group: Texto
diff --git a/languages/it-IT/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/it-IT/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid
diff --git a/languages/ja-JP/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/ja-JP/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid
diff --git a/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/ko-KR/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid
diff --git a/languages/mk-MK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/mk-MK/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid
diff --git a/languages/nl-NL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/nl-NL/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid
diff --git a/languages/pa-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/pa-IN/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid
diff --git a/languages/pl-PL/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/pl-PL/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid
diff --git a/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/pt-BR/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid
diff --git a/languages/pt-PT/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/pt-PT/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid
diff --git a/languages/ru-RU/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/ru-RU/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid
diff --git a/languages/sk-SK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/sk-SK/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid
diff --git a/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid
similarity index 100%
rename from languages/sl-SI/Types/text%2Fx-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid
diff --git a/languages/sv-SE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid
old mode 100755
new mode 100644
similarity index 96%
rename from languages/sv-SE/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid
index c62e54531..145da212d
--- a/languages/sv-SE/Types/text_x-tiddlywiki.tid
+++ b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid
@@ -1,4 +1,4 @@
-title: $:/language/Docs/Types/text/x-tiddlywiki
-description: TiddlyWiki klassisk
-name: text/x-tiddlywiki
-group: Text
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki klassisk
+name: text/x-tiddlywiki
+group: Text
diff --git a/languages/zh-Hans/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/zh-Hans/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid
diff --git a/languages/zh-Hant/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid
similarity index 100%
rename from languages/zh-Hant/Types/text_x-tiddlywiki.tid
rename to plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid