diff --git a/browser/.beforeprettier b/browser/.beforeprettier
index 869038fed2..ba48a023b1 100644
--- a/browser/.beforeprettier
+++ b/browser/.beforeprettier
@@ -130,25 +130,25 @@
 /src/layer/marker/TextInput.js
 /src/layer/Popup.js
 /src/layer/SplitPanesContext.ts
-/src/layer/tile/AutoFillMarkerSection.ts
-/src/layer/tile/CellCursorSection.ts
-/src/layer/tile/CellSelectionHandleSection.ts
-/src/layer/tile/HTMLObjectSection.ts
-/src/layer/tile/CalcValidityDropDownSection.ts
-/src/layer/tile/TextSelectionHandleSection.ts
+/src/canvas/sections/AutoFillMarkerSection.ts
+/src/canvas/sections/CellCursorSection.ts
+/src/canvas/sections/CellSelectionHandleSection.ts
+/src/canvas/sections/HTMLObjectSection.ts
+/src/canvas/sections/CalcValidityDropDownSection.ts
+/src/canvas/sections/TextSelectionHandleSection.ts
 /src/layer/tile/CalcTileLayer.js
-/src/layer/tile/CanvasSectionContainer.ts
-/src/layer/tile/CanvasSectionProps.js
+/src/canvas/CanvasSectionContainer.ts
+/src/canvas/CanvasSectionProps.js
 /src/layer/tile/CanvasTileLayer.js
-/src/layer/tile/CommentListSection.ts
-/src/layer/tile/CommentSection.ts
-/src/layer/tile/ContentControlSection.ts
+/src/canvas/sections/CommentListSection.ts
+/src/canvas/sections/CommentSection.ts
+/src/canvas/sections/ContentControlSection.ts
 /src/layer/tile/ImpressTileLayer.js
-/src/layer/tile/ScrollSection.ts
+/src/canvas/sections/ScrollSection.ts
 /src/layer/tile/SheetGeometry.ts
 /src/layer/tile/SheetSwitch.ts
 /src/layer/tile/TileLayer.TableOverlay.js
-/src/layer/tile/TilesSection.ts
+/src/canvas/sections/TilesSection.ts
 /src/layer/tile/WriterTileLayer.js
 /src/layer/vector/Canvas.js
 /src/layer/vector/CanvasOverlay.ts
diff --git a/browser/Makefile.am b/browser/Makefile.am
index 788f811528..722f302039 100644
--- a/browser/Makefile.am
+++ b/browser/Makefile.am
@@ -218,17 +218,17 @@ COOL_JS_LST =\
 	src/layer/tile/SheetSwitch.ts \
 	src/layer/Layer.js \
 	src/layer/tile/SheetGeometry.ts \
-	src/layer/tile/CanvasSectionProps.js \
-	src/layer/tile/CanvasSectionContainer.ts \
-	src/layer/tile/CommentSection.ts \
-	src/layer/tile/CommentListSection.ts \
-	src/layer/tile/TilesSection.ts \
-	src/layer/tile/AutoFillMarkerSection.ts \
-	src/layer/tile/CellCursorSection.ts \
-	src/layer/tile/CellSelectionHandleSection.ts \
-	src/layer/tile/HTMLObjectSection.ts \
-	src/layer/tile/CalcValidityDropDownSection.ts \
-	src/layer/tile/TextSelectionHandleSection.ts \
+	src/canvas/CanvasSectionProps.js \
+	src/canvas/CanvasSectionContainer.ts \
+	src/canvas/sections/CommentSection.ts \
+	src/canvas/sections/CommentListSection.ts \
+	src/canvas/sections/TilesSection.ts \
+	src/canvas/sections/AutoFillMarkerSection.ts \
+	src/canvas/sections/CellCursorSection.ts \
+	src/canvas/sections/CellSelectionHandleSection.ts \
+	src/canvas/sections/HTMLObjectSection.ts \
+	src/canvas/sections/CalcValidityDropDownSection.ts \
+	src/canvas/sections/TextSelectionHandleSection.ts \
 	src/layer/vector/CEventsHandler.ts \
 	src/layer/vector/CPointSet.ts \
 	src/layer/vector/CPath.ts \
@@ -240,7 +240,7 @@ COOL_JS_LST =\
 	src/layer/vector/CSplitterLine.ts \
 	src/layer/marker/Cursor.ts \
 	src/layer/vector/CanvasOverlay.ts \
-	src/layer/tile/ScrollSection.ts \
+	src/canvas/sections/ScrollSection.ts \
 	src/layer/tile/CanvasTileLayer.js \
 	src/layer/vector/CDarkOverlay.ts \
 	src/layer/SplitPanesContext.ts \
@@ -249,7 +249,7 @@ COOL_JS_LST =\
 	src/layer/tile/WriterTileLayer.js \
 	src/layer/tile/ImpressTileLayer.js \
 	src/layer/tile/CalcTileLayer.js \
-	src/layer/tile/ContentControlSection.ts \
+	src/canvas/sections/ContentControlSection.ts \
 	src/layer/BackgroundColor.js \
 	src/layer/marker/ProgressOverlay.js \
 	src/layer/marker/TextInput.js \
@@ -828,8 +828,8 @@ pot:
 		src/docdispatcher.ts \
 		src/errormessages.js \
 		src/layer/tile/CanvasTileLayer.js \
-		src/layer/tile/CommentListSection.ts \
-		src/layer/tile/CommentSection.ts \
+		src/canvas/sections/CommentListSection.ts \
+		src/canvas/sections/CommentSection.ts \
 		src/main.js \
 		src/map/Clipboard.js \
 		src/map/Map.js \
diff --git a/browser/mocha_tests/helper/canvasContainerSetup.ts b/browser/mocha_tests/helper/canvasContainerSetup.ts
index 9bc7e5d9b7..6151863e0e 100644
--- a/browser/mocha_tests/helper/canvasContainerSetup.ts
+++ b/browser/mocha_tests/helper/canvasContainerSetup.ts
@@ -1,5 +1,5 @@
-/// <reference path="../../src/layer/tile/CanvasSectionContainer.ts" />
-/// <reference path="../../src/layer/tile/TilesSection.ts" />
+/// <reference path="../../src/canvas/CanvasSectionContainer.ts" />
+/// <reference path="../../src/canvas/sections/TilesSection.ts" />
 
 function canvasDomString() {
     return `
diff --git a/browser/src/layer/tile/CanvasSectionContainer.ts b/browser/src/canvas/CanvasSectionContainer.ts
similarity index 100%
rename from browser/src/layer/tile/CanvasSectionContainer.ts
rename to browser/src/canvas/CanvasSectionContainer.ts
diff --git a/browser/src/layer/tile/CanvasSectionProps.js b/browser/src/canvas/CanvasSectionProps.js
similarity index 100%
rename from browser/src/layer/tile/CanvasSectionProps.js
rename to browser/src/canvas/CanvasSectionProps.js
diff --git a/browser/src/layer/tile/AutoFillMarkerSection.ts b/browser/src/canvas/sections/AutoFillMarkerSection.ts
similarity index 100%
rename from browser/src/layer/tile/AutoFillMarkerSection.ts
rename to browser/src/canvas/sections/AutoFillMarkerSection.ts
diff --git a/browser/src/layer/tile/CalcValidityDropDownSection.ts b/browser/src/canvas/sections/CalcValidityDropDownSection.ts
similarity index 100%
rename from browser/src/layer/tile/CalcValidityDropDownSection.ts
rename to browser/src/canvas/sections/CalcValidityDropDownSection.ts
diff --git a/browser/src/layer/tile/CellCursorSection.ts b/browser/src/canvas/sections/CellCursorSection.ts
similarity index 100%
rename from browser/src/layer/tile/CellCursorSection.ts
rename to browser/src/canvas/sections/CellCursorSection.ts
diff --git a/browser/src/layer/tile/CellSelectionHandleSection.ts b/browser/src/canvas/sections/CellSelectionHandleSection.ts
similarity index 100%
rename from browser/src/layer/tile/CellSelectionHandleSection.ts
rename to browser/src/canvas/sections/CellSelectionHandleSection.ts
diff --git a/browser/src/layer/tile/CommentListSection.ts b/browser/src/canvas/sections/CommentListSection.ts
similarity index 100%
rename from browser/src/layer/tile/CommentListSection.ts
rename to browser/src/canvas/sections/CommentListSection.ts
diff --git a/browser/src/layer/tile/CommentSection.ts b/browser/src/canvas/sections/CommentSection.ts
similarity index 100%
rename from browser/src/layer/tile/CommentSection.ts
rename to browser/src/canvas/sections/CommentSection.ts
diff --git a/browser/src/layer/tile/ContentControlSection.ts b/browser/src/canvas/sections/ContentControlSection.ts
similarity index 100%
rename from browser/src/layer/tile/ContentControlSection.ts
rename to browser/src/canvas/sections/ContentControlSection.ts
diff --git a/browser/src/layer/tile/HTMLObjectSection.ts b/browser/src/canvas/sections/HTMLObjectSection.ts
similarity index 100%
rename from browser/src/layer/tile/HTMLObjectSection.ts
rename to browser/src/canvas/sections/HTMLObjectSection.ts
diff --git a/browser/src/layer/tile/ScrollSection.ts b/browser/src/canvas/sections/ScrollSection.ts
similarity index 100%
rename from browser/src/layer/tile/ScrollSection.ts
rename to browser/src/canvas/sections/ScrollSection.ts
diff --git a/browser/src/layer/tile/TextSelectionHandleSection.ts b/browser/src/canvas/sections/TextSelectionHandleSection.ts
similarity index 100%
rename from browser/src/layer/tile/TextSelectionHandleSection.ts
rename to browser/src/canvas/sections/TextSelectionHandleSection.ts
diff --git a/browser/src/layer/tile/TilesSection.ts b/browser/src/canvas/sections/TilesSection.ts
similarity index 100%
rename from browser/src/layer/tile/TilesSection.ts
rename to browser/src/canvas/sections/TilesSection.ts