diff --git a/src/commands/createMerged.ts b/src/commands/createMerged.ts
index a51581a..ee0b8ca 100644
--- a/src/commands/createMerged.ts
+++ b/src/commands/createMerged.ts
@@ -1,8 +1,8 @@
 import { App, Command } from "obsidian";
 
+import { TimekeepMergerModal } from "@/modals/TimekeepMergerModal";
 import { TimekeepSettings } from "@/settings";
 import { Store } from "@/store";
-import { TimekeepMergerModal } from "@/views/timekeep-merger-modal";
 
 export default function (app: App, settings: Store<TimekeepSettings>): Command {
 	return {
diff --git a/src/commands/exportMergedPdf.ts b/src/commands/exportMergedPdf.ts
index ab8b7a0..f7391c3 100644
--- a/src/commands/exportMergedPdf.ts
+++ b/src/commands/exportMergedPdf.ts
@@ -1,8 +1,8 @@
 import { App, Command } from "obsidian";
 
+import { TimekeepMergerModal } from "@/modals/TimekeepMergerModal";
 import { TimekeepSettings } from "@/settings";
 import { Store } from "@/store";
-import { TimekeepMergerModal } from "@/views/timekeep-merger-modal";
 
 export default function (app: App, settings: Store<TimekeepSettings>): Command {
 	return {
diff --git a/src/commands/findRunningTrackers.ts b/src/commands/findRunningTrackers.ts
index 529cb92..1ecc04c 100644
--- a/src/commands/findRunningTrackers.ts
+++ b/src/commands/findRunningTrackers.ts
@@ -1,6 +1,6 @@
 import { App, Command } from "obsidian";
 
-import { TimekeepLocatorModal } from "@/views/timekeep-locator-modal";
+import { TimekeepLocatorModal } from "@/modals/TimekeepLocatorModal";
 
 export default function (app: App): Command {
 	return {
diff --git a/src/components/TimesheetRow/TimesheetRowContentEditing.ts b/src/components/TimesheetRow/TimesheetRowContentEditing.ts
index 897fbcf..66a52d5 100644
--- a/src/components/TimesheetRow/TimesheetRowContentEditing.ts
+++ b/src/components/TimesheetRow/TimesheetRowContentEditing.ts
@@ -8,9 +8,9 @@ import type { TimeEntry, Timekeep } from "@/timekeep/schema";
 
 import { createObsidianIcon } from "@/components/obsidianIcon";
 import { ReplaceableComponent } from "@/components/ReplaceableComponent";
+import { ConfirmModal } from "@/modals/ConfirmModal";
 import { removeEntry, updateEntry } from "@/timekeep/update";
 import { formatEditableTimestamp, parseEditableTimestamp } from "@/utils/time";
-import { ConfirmModal } from "@/views/confirm-modal";
 
 /**
  * Component for a timesheet row entry that is currently
diff --git a/src/export/pdf.ts b/src/export/pdf.ts
index 52ed3a3..105ad48 100644
--- a/src/export/pdf.ts
+++ b/src/export/pdf.ts
@@ -13,6 +13,7 @@ import pdfMake from "pdfmake";
 import type { TimekeepSettings } from "@/settings";
 import type { TimeEntry, Timekeep } from "@/timekeep/schema";
 
+import { FileNamePromptModal } from "@/modals/FileNamePromptModal";
 import { PdfExportBehavior } from "@/settings";
 import { getEntryDuration, getTotalDuration } from "@/timekeep/queries";
 import {
@@ -21,7 +22,6 @@ import {
 	formatPdfDate,
 	formatPdfRowDate,
 } from "@/utils/time";
-import { FileNamePromptModal } from "@/views/file-name-prompt-modal";
 
 // Embedded fonts
 import RobotoBold from "@/fonts/Roboto-Bold.ttf";
diff --git a/src/main.ts b/src/main.ts
index 044b9ab..15eedf5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -29,9 +29,8 @@ import {
 } from "@/timekeep/queries";
 import { stopAllTimekeeps } from "@/timekeep/stopAllTimekeeps";
 import { stopFileTimekeeps } from "@/timekeep/stopFileTimekeeps";
-import { TimekeepMarkdownView } from "@/views/timekeep-markdown-view";
-
-import { TimekeepFileView } from "./views/timekeep-file-view";
+import TimekeepFileView from "@/views/TimekeepFileView";
+import TimekeepMarkdownView from "@/views/TimekeepMarkdownView";
 
 export default class TimekeepPlugin extends Plugin {
 	/** Store containing the plugin settings */
diff --git a/src/views/confirm-modal.test.ts b/src/modals/ConfirmModal.test.ts
similarity index 96%
rename from src/views/confirm-modal.test.ts
rename to src/modals/ConfirmModal.test.ts
index bd9daa7..703cf75 100644
--- a/src/views/confirm-modal.test.ts
+++ b/src/modals/ConfirmModal.test.ts
@@ -4,7 +4,7 @@ import type { App } from "obsidian";
 
 import { describe, it, expect, beforeEach, Mock, vi } from "vitest";
 
-import { ConfirmModal } from "./confirm-modal";
+import { ConfirmModal } from "./ConfirmModal";
 
 describe("ConfirmModal", () => {
 	let app: App;
diff --git a/src/views/confirm-modal.ts b/src/modals/ConfirmModal.ts
similarity index 100%
rename from src/views/confirm-modal.ts
rename to src/modals/ConfirmModal.ts
diff --git a/src/views/file-name-prompt-modal.test.ts b/src/modals/FileNamePromptModal.test.ts
similarity index 96%
rename from src/views/file-name-prompt-modal.test.ts
rename to src/modals/FileNamePromptModal.test.ts
index e7ab6e8..bd02ac3 100644
--- a/src/views/file-name-prompt-modal.test.ts
+++ b/src/modals/FileNamePromptModal.test.ts
@@ -4,7 +4,7 @@ import type { App } from "obsidian";
 
 import { describe, it, expect, beforeEach, Mock, vi } from "vitest";
 
-import { FileNamePromptModal } from "./file-name-prompt-modal";
+import { FileNamePromptModal } from "./FileNamePromptModal";
 
 describe("ConfirmModal", () => {
 	let app: App;
diff --git a/src/views/file-name-prompt-modal.ts b/src/modals/FileNamePromptModal.ts
similarity index 100%
rename from src/views/file-name-prompt-modal.ts
rename to src/modals/FileNamePromptModal.ts
diff --git a/src/views/timekeep-locator-modal.ts b/src/modals/TimekeepLocatorModal.ts
similarity index 100%
rename from src/views/timekeep-locator-modal.ts
rename to src/modals/TimekeepLocatorModal.ts
diff --git a/src/views/timekeep-merger-modal.ts b/src/modals/TimekeepMergerModal.ts
similarity index 100%
rename from src/views/timekeep-merger-modal.ts
rename to src/modals/TimekeepMergerModal.ts
diff --git a/src/views/timekeep-file-view.ts b/src/views/TimekeepFileView.ts
similarity index 98%
rename from src/views/timekeep-file-view.ts
rename to src/views/TimekeepFileView.ts
index 3fd8ab6..e95763d 100644
--- a/src/views/timekeep-file-view.ts
+++ b/src/views/TimekeepFileView.ts
@@ -10,7 +10,7 @@ import { createStore, Store } from "@/store";
 import { load, LoadResult } from "@/timekeep/parser";
 import { stripTimekeepRuntimeData, Timekeep } from "@/timekeep/schema";
 
-export class TimekeepFileView extends EditableFileView {
+export default class TimekeepFileView extends EditableFileView {
 	/** Access to the timekeep settings */
 	settings: Store<TimekeepSettings>;
 	/** Access to custom output formats */
diff --git a/src/views/timekeep-markdown-view.ts b/src/views/TimekeepMarkdownView.ts
similarity index 98%
rename from src/views/timekeep-markdown-view.ts
rename to src/views/TimekeepMarkdownView.ts
index 413c156..f245b80 100644
--- a/src/views/timekeep-markdown-view.ts
+++ b/src/views/TimekeepMarkdownView.ts
@@ -14,7 +14,7 @@ import { type Store, createStore } from "@/store";
 import { type LoadResult, load, replaceTimekeepCodeblock } from "@/timekeep/parser";
 import { type Timekeep, stripTimekeepRuntimeData } from "@/timekeep/schema";
 
-export class TimekeepMarkdownView extends MarkdownRenderChild {
+export default class TimekeepMarkdownView extends MarkdownRenderChild {
 	// Obsidian app instance
 	app: App;
 	// Timekeep settings store