diff --git a/plugins/tiddlywiki/text-slicer/export-full-doc.tid b/plugins/tiddlywiki/text-slicer/export-full-doc.tid
deleted file mode 100644
index fae17b167..000000000
--- a/plugins/tiddlywiki/text-slicer/export-full-doc.tid
+++ /dev/null
@@ -1,4 +0,0 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/export-full-doc
-tags: $:/tags/ViewTemplate
-
-<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/template-tiddler" listItem="item"/>
diff --git a/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid b/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid
new file mode 100644
index 000000000..097e15787
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/exporters/full-doc.tid
@@ -0,0 +1,4 @@
+title: $:/plugins/tiddlywiki/text-slicer/exporters/full-doc
+tags: $:/tags/ViewTemplate
+
+<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler" listItem="item"/>
diff --git a/plugins/tiddlywiki/text-slicer/icon.tid b/plugins/tiddlywiki/text-slicer/icon.tid
index 5a14a2614..08ab0af56 100644
--- a/plugins/tiddlywiki/text-slicer/icon.tid
+++ b/plugins/tiddlywiki/text-slicer/icon.tid
@@ -5,7 +5,7 @@ tags: $:/tags/Image
     <g fill-rule="evenodd" sketch:type="MSPage">
         <path d="M64,0 L118.5596,32 L118.5596,96 L64,128 L9.44039956,96 L9.44039956,32 L64,0 Z" ></path>
         <g transform="translate(32.000000, 32.000000) scale(2.19)" fill="#ffffff">
-            {{$:/plugins/tiddlywiki/text-slicer/text-slicer-icon}}
+            {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/text-slicer/text-slicer-icon.tid b/plugins/tiddlywiki/text-slicer/images/text-slicer-icon.tid
similarity index 99%
rename from plugins/tiddlywiki/text-slicer/text-slicer-icon.tid
rename to plugins/tiddlywiki/text-slicer/images/text-slicer-icon.tid
index 369bb26a2..c52901ae2 100644
--- a/plugins/tiddlywiki/text-slicer/text-slicer-icon.tid
+++ b/plugins/tiddlywiki/text-slicer/images/text-slicer-icon.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/text-slicer-icon
+title: $:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon
 tags: $:/tags/Image
 
 <svg class="tc-image-text-slicer tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
diff --git a/plugins/tiddlywiki/text-slicer/slicer.js b/plugins/tiddlywiki/text-slicer/modules/slicer.js
similarity index 99%
rename from plugins/tiddlywiki/text-slicer/slicer.js
rename to plugins/tiddlywiki/text-slicer/modules/slicer.js
index 1422e69f2..bbd51c0a5 100644
--- a/plugins/tiddlywiki/text-slicer/slicer.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicer.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/text-slicer/slicer.js
+title: $:/plugins/tiddlywiki/text-slicer/modules/slicer.js
 type: application/javascript
 module-type: startup
 
diff --git a/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid b/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid
deleted file mode 100644
index 5a81d33f9..000000000
--- a/plugins/tiddlywiki/text-slicer/tag-TextSlicerToolbar.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/tags/TextSlicerToolbar
-list: $:/plugins/tiddlywiki/text-slicer/toolbar/title $:/plugins/tiddlywiki/text-slicer/toolbar/tags $:/plugins/tiddlywiki/text-slicer/toolbar/rename $:/plugins/tiddlywiki/text-slicer/toolbar/edit $:/plugins/tiddlywiki/text-slicer/toolbar/cancel $:/plugins/tiddlywiki/text-slicer/toolbar/done
-
diff --git a/plugins/tiddlywiki/text-slicer/template-view-document.tid b/plugins/tiddlywiki/text-slicer/template-view-document.tid
deleted file mode 100644
index 2ed826e78..000000000
--- a/plugins/tiddlywiki/text-slicer/template-view-document.tid
+++ /dev/null
@@ -1,6 +0,0 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/view-document
-
-<$button>
-<$action-sendmessage $message="tm-open-window" $param=<<currentTiddler>> template="$:/plugins/tiddlywiki/text-slicer/templates/export-full-doc"/>
-View document
-</$button>
diff --git a/plugins/tiddlywiki/text-slicer/template-document.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
similarity index 79%
rename from plugins/tiddlywiki/text-slicer/template-document.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
index 260857e6e..f50cb1a68 100644
--- a/plugins/tiddlywiki/text-slicer/template-document.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-document
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/document
 
 \define config-show-toolbar()
 $:/config/plugins/tiddlywiki/text-slicer/show-toolbar/$(currentTiddler)$
@@ -21,7 +21,7 @@ $:/config/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
 
 <$checkbox tiddler=<<config-show-toolbar>> field="text" checked="yes" unchecked="no" default="no"> Show toolbar</$checkbox>
 
-{{||$:/plugins/tiddlywiki/text-slicer/templates/view-document}}
+{{||$:/plugins/tiddlywiki/text-slicer/ui/view-document-button}}
 
 </div>
 
@@ -29,7 +29,7 @@ $:/config/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
 
 <$set name="tv-show-toolbar" value={{$(config-show-toolbar)$}}>
 
-<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/template-tiddler" listItem="item"/>
+<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler" listItem="item"/>
 
 </$set>
 
diff --git a/plugins/tiddlywiki/text-slicer/template-heading.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
similarity index 88%
rename from plugins/tiddlywiki/text-slicer/template-heading.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
index 53ff664c2..b8cdb9c65 100644
--- a/plugins/tiddlywiki/text-slicer/template-heading.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-heading
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/heading
 
 \define config-heading-status()
 $(tv-heading-status-config-title)$/$(currentTiddler)$
@@ -27,7 +27,7 @@ $(tv-heading-status-config-title)$/$(currentTiddler)$
 <$view field="text"/>
 </$link>
 <$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="open" default=<<tv-default-heading-state>>>
-<$list filter="[tag<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/template-tiddler" listItem="item"/>
+<$list filter="[tag<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler" listItem="item"/>
 </$reveal>
 </div>
 </$set>
diff --git a/plugins/tiddlywiki/text-slicer/template-item.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/item.tid
similarity index 53%
rename from plugins/tiddlywiki/text-slicer/template-item.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/item.tid
index 9b5b10381..dead11be9 100644
--- a/plugins/tiddlywiki/text-slicer/template-item.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/item.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-item
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/item
 
 <$link tag="li" class="tc-document-tiddler-link">
 
diff --git a/plugins/tiddlywiki/text-slicer/template-list.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/list.tid
similarity index 57%
rename from plugins/tiddlywiki/text-slicer/template-list.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/list.tid
index d3962143f..121c172b2 100644
--- a/plugins/tiddlywiki/text-slicer/template-list.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/list.tid
@@ -1,8 +1,8 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-list
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/list
 
 \define body(type:"ul")
 <$type$>
-<$list filter={{!!text}} template="$:/plugins/tiddlywiki/text-slicer/templates/template-tiddler" listItem="item"/>
+<$list filter={{!!text}} template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler" listItem="item"/>
 </$type$>
 \end
 
diff --git a/plugins/tiddlywiki/text-slicer/template-paragraph.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/paragraph.tid
similarity index 51%
rename from plugins/tiddlywiki/text-slicer/template-paragraph.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/paragraph.tid
index 32b33ea6e..11a22b34f 100644
--- a/plugins/tiddlywiki/text-slicer/template-paragraph.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/paragraph.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-paragraph
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/paragraph
 
 <$link tag="div" class="tc-document-tiddler-link">
 
diff --git a/plugins/tiddlywiki/text-slicer/template-tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
similarity index 69%
rename from plugins/tiddlywiki/text-slicer/template-tiddler.tid
rename to plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
index 8facfe086..45a8499a9 100644
--- a/plugins/tiddlywiki/text-slicer/template-tiddler.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
@@ -1,25 +1,25 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/template-tiddler
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler
 
 <$list filter="[<tv-show-toolbar>prefix[yes]]" variable="hasToolbar">
-{{||$:/plugins/tiddlywiki/text-slicer/templates/tiddler-toolbar}}
+{{||$:/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar}}
 </$list>
 
 <$reveal type="match" state="!!toc-type" text="document">
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-document" mode="block"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/document" mode="block"/>
 </$reveal>
 
 <$reveal type="match" state="!!toc-type" text="heading">
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-heading" mode="block"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/heading" mode="block"/>
 </$reveal>
 
 <$reveal type="match" state="!!toc-type" text="paragraph">
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-paragraph" mode="block"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/paragraph" mode="block"/>
 </$reveal>
 
 <$reveal type="match" state="!!toc-type" text="list">
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-list" mode="block"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/list" mode="block"/>
 </$reveal>
 
 <$reveal type="match" state="!!toc-type" text="item">
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-item" mode="block"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/item" mode="block"/>
 </$reveal>
diff --git a/plugins/tiddlywiki/text-slicer/preview-column.tid b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
similarity index 69%
rename from plugins/tiddlywiki/text-slicer/preview-column.tid
rename to plugins/tiddlywiki/text-slicer/ui/preview-column.tid
index 67b2d6e43..91f0e03e5 100644
--- a/plugins/tiddlywiki/text-slicer/preview-column.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/preview-column
+title: $:/plugins/tiddlywiki/text-slicer/ui/preview-column
 tags: $:/tags/AboveStory
 
 <$scrollable fallthrough="no" class="tc-document-preview-column">
@@ -7,7 +7,7 @@ tags: $:/tags/AboveStory
 
 <$set name="tv-show-gadgets" value="yes">
 
-<$list filter="[toc-type[document]!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/template-document"/>
+<$list filter="[toc-type[document]!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/document"/>
 
 </$set>
 
diff --git a/plugins/tiddlywiki/text-slicer/slice-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
similarity index 70%
rename from plugins/tiddlywiki/text-slicer/slice-button.tid
rename to plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
index 2ce65e615..b4566f5f9 100644
--- a/plugins/tiddlywiki/text-slicer/slice-button.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
@@ -1,7 +1,7 @@
-title: $:/plugins/tiddlywiki/text-slicer/ui/slice-button
+title: $:/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button
 tags: $:/tags/ViewToolbar
 list-before: $:/core/ui/Buttons/edit
-caption: {{$:/plugins/tiddlywiki/text-slicer/text-slicer-icon}} Slice tiddler
+caption: {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}} Slice tiddler
 description: Slice this tiddler by headings and lists
 
 \define hint()
@@ -10,7 +10,7 @@ Slice this tiddler by headings and lists
 
 <$button message="tm-slice-tiddler" param=<<currentTiddler>> tooltip=<<hint>> aria-label=<<hint>> class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
-{{$:/plugins/tiddlywiki/text-slicer/text-slicer-icon}}
+{{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text">Slice tiddler</span>
diff --git a/plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid b/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
similarity index 79%
rename from plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid
rename to plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
index 3d6c3215e..95e298f6a 100644
--- a/plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/tiddler-toolbar
+title: $:/plugins/tiddlywiki/text-slicer/ui/toolbar/tiddler-toolbar
 
 <$list filter="[<tv-show-gadgets>prefix[yes]]" variable="hasToolbar">
 <div class="tc-slice-toolbar">
diff --git a/plugins/tiddlywiki/text-slicer/toolbar-title.tid b/plugins/tiddlywiki/text-slicer/ui/toolbar/title.tid
similarity index 93%
rename from plugins/tiddlywiki/text-slicer/toolbar-title.tid
rename to plugins/tiddlywiki/text-slicer/ui/toolbar/title.tid
index 98e3b9359..be5a1a5bc 100644
--- a/plugins/tiddlywiki/text-slicer/toolbar-title.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/toolbar/title.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/toolbar/title
+title: $:/plugins/tiddlywiki/text-slicer/ui/toolbar/title
 tags: $:/tags/TextSlicerToolbar
 
 \define renameProxyTitle()
diff --git a/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid b/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid
new file mode 100644
index 000000000..4afdf4d90
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/ui/view-document-button.tid
@@ -0,0 +1,6 @@
+title: $:/plugins/tiddlywiki/text-slicer/ui/view-document-button
+
+<$button>
+<$action-sendmessage $message="tm-open-window" $param=<<currentTiddler>> template="$:/plugins/tiddlywiki/text-slicer/exporters/full-doc"/>
+View document
+</$button>
diff --git a/plugins/tiddlywiki/text-slicer/view-template-tiddler.tid b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
similarity index 83%
rename from plugins/tiddlywiki/text-slicer/view-template-tiddler.tid
rename to plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
index 254b906e7..9e128b4f8 100644
--- a/plugins/tiddlywiki/text-slicer/view-template-tiddler.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
@@ -1,4 +1,4 @@
-title: $:/plugins/tiddlywiki/text-slicer/templates/view-template-tiddler
+title: $:/plugins/tiddlywiki/text-slicer/ui/view-template-segment
 tags: $:/tags/ViewTemplate
 
 <$reveal type="nomatch" state="!!toc-type" text="">
@@ -15,7 +15,7 @@ tags: $:/tags/ViewTemplate
 
 <$set name="tv-show-gadgets" value="yes">
 
-<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/template-tiddler"/>
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler"/>
 
 </$set>