diff --git a/boot/boot.css.tid b/boot/boot.css.tid
index 960ca905f..bf2e079d4 100644
--- a/boot/boot.css.tid
+++ b/boot/boot.css.tid
@@ -1,4 +1,4 @@
-title: $:/core/styles/boot.css
+title: $:/boot/boot.css
 type: text/css
 
 /*
diff --git a/boot/boot.js b/boot/boot.js
index c94579dba..fe4c57146 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/boot.js
+title: $:/boot/boot.js
 type: application/javascript
 
 The main boot kernel for TiddlyWiki. This single file creates a barebones TW environment that is just sufficient to bootstrap the modules containing the main logic of the application.
diff --git a/boot/bootprefix.js b/boot/bootprefix.js
index 332aa1abd..90e30a80c 100644
--- a/boot/bootprefix.js
+++ b/boot/bootprefix.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/bootprefix.js
+title: $:/boot/bootprefix.js
 type: application/javascript
 
 This file sets up the globals that need to be available when JavaScript modules are executed in the browser. The overall sequence is:
diff --git a/core/templates/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid
index c763b4012..a42c30c5a 100644
--- a/core/templates/tiddlywiki5.template.html.tid
+++ b/core/templates/tiddlywiki5.template.html.tid
@@ -31,7 +31,7 @@ title: $:/core/templates/tiddlywiki5.template.html
 </noscript>
 <!----------- Miscellaneous system tiddlers ----------->
 <div id="systemArea" style="display:none;">
-{{{ [is[system]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]] ||$:/core/templates/html-div-tiddler}}}
+{{{ [is[system]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] ||$:/core/templates/html-div-tiddler}}}
 </div>
 <!----------- Ordinary tiddlers ----------->
 {{$:/core/templates/store.area.template.html}}
@@ -42,7 +42,7 @@ title: $:/core/templates/tiddlywiki5.template.html
 </div>
 <!----------- Boot kernel prologue ----------->
 <div id="bootKernelPrefix" style="display:none;">
-{{ $:/core/bootprefix.js ||$:/core/templates/javascript-tiddler}}
+{{ $:/boot/bootprefix.js ||$:/core/templates/javascript-tiddler}}
 </div>
 <!----------- Plugin modules ----------->
 <div id="modules" style="display:none;">
@@ -50,7 +50,7 @@ title: $:/core/templates/tiddlywiki5.template.html
 </div>
 <!----------- Boot kernel ----------->
 <div id="bootKernel" style="display:none;">
-{{ $:/core/boot.js ||$:/core/templates/javascript-tiddler}}
+{{ $:/boot/boot.js ||$:/core/templates/javascript-tiddler}}
 </div>
 </body>
 </html>
diff --git a/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid b/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
index 58f66816b..9e4f1a9a8 100644
--- a/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
+++ b/editions/tw5.com/tiddlers/TiddlyWikiArchitecture.tid
@@ -7,4 +7,4 @@ The heart of TiddlyWiki can be seen as an extensible representation transformati
 
 The primary use of the engine is to convert raw `text/vnd.tiddlywiki` WikiText into a `text/html` or `text/plain` representation for display. The transclusion and templating features of WikiText allow the engine to also be used to generate TiddlyWiki HTML files from raw tiddlers.
 
-If you're interested in understanding more about the internal operation of TiddlyWiki, it is recommended that you review the DeveloperDocs and read the code -- start with the boot kernel [[$:/core/boot.js]].
\ No newline at end of file
+If you're interested in understanding more about the internal operation of TiddlyWiki, it is recommended that you review the DeveloperDocs and read the code -- start with the boot kernel [[$:/boot/boot.js]].
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
index 37a8c17cb..ada426c26 100644
--- a/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/BootMechanism.tid
@@ -15,7 +15,7 @@ Some plugin modules have further sub-plugins: the wikitext parser, for instance,
 
 In TiddlyWiki5, [[Plugins]] are bundles of tiddlers that are distributed and managed as one; [[Modules]] are JavaScript tiddlers with a module type identifying when and how they should be executed.
 
-The tiddler [[$:/core/boot.js]] is a barebones TiddlyWiki kernel that is just sufficient to load the core plugin modules and trigger a startup module to load up the rest of the application.
+The tiddler [[$:/boot/boot.js]] is a barebones TiddlyWiki kernel that is just sufficient to load the core plugin modules and trigger a startup module to load up the rest of the application.
 
 The kernel includes: