diff --git a/src/PageState.ts b/src/PageState.ts
index 80c6c19..7105515 100644
--- a/src/PageState.ts
+++ b/src/PageState.ts
@@ -1,4 +1,4 @@
-import { Page } from "./PageSystem/Page";
+import { Page } from "./types/Page";
 import { allPages } from "./allPages";
 import { getKeyByObjectPropertyValue } from "./utils";
 
diff --git a/src/allPages.ts b/src/allPages.ts
index 829842a..175beee 100644
--- a/src/allPages.ts
+++ b/src/allPages.ts
@@ -13,7 +13,7 @@ import { NewTOTPEnginePage } from "./pages/NewEngines/NewTOTPEngine";
 import { NewTOTPPage } from "./pages/TOTP/NewTOTP";
 import { NewTransitEnginePage } from "./pages/NewEngines/NewTransitEngine";
 import { NewTransitKeyPage } from "./pages/Transit/NewTransitKey";
-import { Page } from "./PageSystem/Page";
+import { Page } from "./types/Page";
 import { PwGenPage } from "./pages/PwGen";
 import { SetLanguagePage } from "./pages/SetLanguage";
 import { SetVaultURLPage } from "./pages/SetVaultURL";
diff --git a/src/pages/Home.ts b/src/pages/Home.ts
index d3c47bd..b9edc6a 100644
--- a/src/pages/Home.ts
+++ b/src/pages/Home.ts
@@ -1,5 +1,5 @@
 import { MountType, getMounts } from "../api/sys/getMounts";
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { getCapabilitiesPath } from "../api/sys/getCapabilities";
 import { lookupSelf } from "../api/sys/lookupSelf";
 import { makeElement } from "../htmlUtils";
diff --git a/src/pages/KeyValue/KeyValueDelete.ts b/src/pages/KeyValue/KeyValueDelete.ts
index 80ae119..1c34e10 100644
--- a/src/pages/KeyValue/KeyValueDelete.ts
+++ b/src/pages/KeyValue/KeyValueDelete.ts
@@ -1,4 +1,4 @@
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { deleteSecret } from "../../api/kv/deleteSecret";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/KeyValue/KeyValueNew.ts b/src/pages/KeyValue/KeyValueNew.ts
index 7d2c384..93ecd41 100644
--- a/src/pages/KeyValue/KeyValueNew.ts
+++ b/src/pages/KeyValue/KeyValueNew.ts
@@ -1,4 +1,4 @@
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { createOrUpdateSecret } from "../../api/kv/createOrUpdateSecret";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/KeyValue/KeyValueSecret.ts b/src/pages/KeyValue/KeyValueSecret.ts
index 7caf891..e19024a 100644
--- a/src/pages/KeyValue/KeyValueSecret.ts
+++ b/src/pages/KeyValue/KeyValueSecret.ts
@@ -1,5 +1,5 @@
 import { CopyableInputBox } from "../../elements/CopyableInputBox";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getCapabilities } from "../../api/sys/getCapabilities";
 import { getSecret } from "../../api/kv/getSecret";
diff --git a/src/pages/KeyValue/KeyValueSecretsEdit.ts b/src/pages/KeyValue/KeyValueSecretsEdit.ts
index 855fa07..52e8b5f 100644
--- a/src/pages/KeyValue/KeyValueSecretsEdit.ts
+++ b/src/pages/KeyValue/KeyValueSecretsEdit.ts
@@ -1,5 +1,5 @@
 import { CodeJar } from "codejar";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { createOrUpdateSecret } from "../../api/kv/createOrUpdateSecret";
 import { getSecret } from "../../api/kv/getSecret";
diff --git a/src/pages/KeyValue/KeyValueVersions.ts b/src/pages/KeyValue/KeyValueVersions.ts
index 7df4fba..bbd15de 100644
--- a/src/pages/KeyValue/KeyValueVersions.ts
+++ b/src/pages/KeyValue/KeyValueVersions.ts
@@ -1,4 +1,4 @@
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getSecretMetadata } from "../../api/kv/getSecretMetadata";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/KeyValue/KeyValueView.ts b/src/pages/KeyValue/KeyValueView.ts
index 16b3e1b..71f34ba 100644
--- a/src/pages/KeyValue/KeyValueView.ts
+++ b/src/pages/KeyValue/KeyValueView.ts
@@ -1,5 +1,5 @@
 import { DoesNotExistError } from "../../types/internalErrors";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getSecrets } from "../../api/kv/getSecrets";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/Login.ts b/src/pages/Login.ts
index 5756a58..b588e85 100644
--- a/src/pages/Login.ts
+++ b/src/pages/Login.ts
@@ -1,6 +1,6 @@
 import { Margin } from "../elements/Margin";
 import { MarginInline } from "../elements/MarginInline";
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { lookupSelf } from "../api/sys/lookupSelf";
 import { makeElement } from "../htmlUtils";
 import { setErrorText } from "../pageUtils";
diff --git a/src/pages/Me.ts b/src/pages/Me.ts
index deab685..b63e9ab 100644
--- a/src/pages/Me.ts
+++ b/src/pages/Me.ts
@@ -1,4 +1,4 @@
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { addClipboardNotifications, prePageChecks, setErrorText } from "../pageUtils";
 import { getCapabilitiesPath } from "../api/sys/getCapabilities";
 import { makeElement } from "../htmlUtils";
diff --git a/src/pages/NewEngines/NewKVEngine.ts b/src/pages/NewEngines/NewKVEngine.ts
index fa2ff26..306c6dc 100644
--- a/src/pages/NewEngines/NewKVEngine.ts
+++ b/src/pages/NewEngines/NewKVEngine.ts
@@ -1,6 +1,6 @@
 import { Margin } from "../../elements/Margin";
 import { Option } from "../../elements/Option";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { makeElement } from "../../htmlUtils";
 import { newMount } from "../../api/sys/newMount";
 import { setErrorText } from "../../pageUtils";
diff --git a/src/pages/NewEngines/NewTOTPEngine.ts b/src/pages/NewEngines/NewTOTPEngine.ts
index c70111e..382064d 100644
--- a/src/pages/NewEngines/NewTOTPEngine.ts
+++ b/src/pages/NewEngines/NewTOTPEngine.ts
@@ -1,5 +1,5 @@
 import { Margin } from "../../elements/Margin";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { makeElement } from "../../htmlUtils";
 import { newMount } from "../../api/sys/newMount";
 import { setErrorText } from "../../pageUtils";
diff --git a/src/pages/NewEngines/NewTransitEngine.ts b/src/pages/NewEngines/NewTransitEngine.ts
index 79ae03e..0566932 100644
--- a/src/pages/NewEngines/NewTransitEngine.ts
+++ b/src/pages/NewEngines/NewTransitEngine.ts
@@ -1,5 +1,5 @@
 import { Margin } from "../../elements/Margin";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { makeElement } from "../../htmlUtils";
 import { newMount } from "../../api/sys/newMount";
 import { setErrorText } from "../../pageUtils";
diff --git a/src/pages/NewSecretsEngine.ts b/src/pages/NewSecretsEngine.ts
index 9b73376..cc0776f 100644
--- a/src/pages/NewSecretsEngine.ts
+++ b/src/pages/NewSecretsEngine.ts
@@ -1,4 +1,4 @@
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { Tile } from "../elements/Tile";
 import { makeElement } from "../htmlUtils";
 import i18next from "i18next";
diff --git a/src/pages/PwGen.ts b/src/pages/PwGen.ts
index 397eadc..b72e48f 100644
--- a/src/pages/PwGen.ts
+++ b/src/pages/PwGen.ts
@@ -1,7 +1,7 @@
 import { CopyableInputBox, CopyableInputBoxType } from "../elements/CopyableInputBox";
 import { Margin } from "../elements/Margin";
 import { Option } from "../elements/Option";
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { makeElement } from "../htmlUtils";
 import i18next from "i18next";
 
diff --git a/src/pages/SetLanguage.ts b/src/pages/SetLanguage.ts
index a0481d3..7d5d0ef 100644
--- a/src/pages/SetLanguage.ts
+++ b/src/pages/SetLanguage.ts
@@ -1,5 +1,5 @@
 import { Margin } from "../elements/Margin";
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { makeElement } from "../htmlUtils";
 import { reloadNavBar } from "../elements/NavBar";
 import i18next from "i18next";
diff --git a/src/pages/SetVaultURL.ts b/src/pages/SetVaultURL.ts
index ff693f9..e4d8d83 100644
--- a/src/pages/SetVaultURL.ts
+++ b/src/pages/SetVaultURL.ts
@@ -1,4 +1,4 @@
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { makeElement } from "../htmlUtils";
 
 export class SetVaultURLPage extends Page {
diff --git a/src/pages/TOTP/NewTOTP.ts b/src/pages/TOTP/NewTOTP.ts
index 40108f2..17623b9 100644
--- a/src/pages/TOTP/NewTOTP.ts
+++ b/src/pages/TOTP/NewTOTP.ts
@@ -1,6 +1,6 @@
 import { Margin } from "../../elements/Margin";
 import { MarginInline } from "../../elements/MarginInline";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { addNewTOTP } from "../../api/totp/addNewTOTP";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/TOTP/TOTPView.ts b/src/pages/TOTP/TOTPView.ts
index ae94510..7ec65ae 100644
--- a/src/pages/TOTP/TOTPView.ts
+++ b/src/pages/TOTP/TOTPView.ts
@@ -1,6 +1,6 @@
 import { CopyableInputBox } from "../../elements/CopyableInputBox";
 import { DoesNotExistError } from "../../types/internalErrors";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getTOTPCode } from "../../api/totp/getTOTPCode";
 import { getTOTPKeys } from "../../api/totp/getTOTPKeys";
diff --git a/src/pages/Transit/NewTransitKey.ts b/src/pages/Transit/NewTransitKey.ts
index 55ea8fa..362a4fc 100644
--- a/src/pages/Transit/NewTransitKey.ts
+++ b/src/pages/Transit/NewTransitKey.ts
@@ -1,6 +1,6 @@
 import { Margin } from "../../elements/Margin";
 import { Option } from "../../elements/Option";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { makeElement } from "../../htmlUtils";
 import { newTransitKey } from "../../api/transit/newTransitKey";
diff --git a/src/pages/Transit/TransitDecrypt.ts b/src/pages/Transit/TransitDecrypt.ts
index 8170c05..b2c53c2 100644
--- a/src/pages/Transit/TransitDecrypt.ts
+++ b/src/pages/Transit/TransitDecrypt.ts
@@ -1,7 +1,7 @@
 import { CopyableModal } from "../../elements/CopyableModal";
 import { FileUploadInput } from "../../elements/FileUploadInput";
 import { Margin } from "../../elements/Margin";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { fileToBase64, makeElement } from "../../htmlUtils";
 import { setErrorText } from "../../pageUtils";
diff --git a/src/pages/Transit/TransitEncrypt.ts b/src/pages/Transit/TransitEncrypt.ts
index 201163c..3f02c1e 100644
--- a/src/pages/Transit/TransitEncrypt.ts
+++ b/src/pages/Transit/TransitEncrypt.ts
@@ -1,7 +1,7 @@
 import { CopyableModal } from "../../elements/CopyableModal";
 import { FileUploadInput } from "../../elements/FileUploadInput";
 import { Margin } from "../../elements/Margin";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { fileToBase64, makeElement } from "../../htmlUtils";
 import { setErrorText } from "../../pageUtils";
diff --git a/src/pages/Transit/TransitRewrap.ts b/src/pages/Transit/TransitRewrap.ts
index bf72e0a..426e4a4 100644
--- a/src/pages/Transit/TransitRewrap.ts
+++ b/src/pages/Transit/TransitRewrap.ts
@@ -1,7 +1,7 @@
 import { CopyableModal } from "../../elements/CopyableModal";
 import { Margin } from "../../elements/Margin";
 import { Option } from "../../elements/Option";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getTransitKey } from "../../api/transit/getTransitKey";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/Transit/TransitView.ts b/src/pages/Transit/TransitView.ts
index 3990f23..7450d46 100644
--- a/src/pages/Transit/TransitView.ts
+++ b/src/pages/Transit/TransitView.ts
@@ -1,5 +1,5 @@
 import { DoesNotExistError } from "../../types/internalErrors";
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { getTransitKeys } from "../../api/transit/getTransitKeys";
 import { makeElement } from "../../htmlUtils";
diff --git a/src/pages/Transit/TransitViewSecret.ts b/src/pages/Transit/TransitViewSecret.ts
index 42b3b0c..24dce71 100644
--- a/src/pages/Transit/TransitViewSecret.ts
+++ b/src/pages/Transit/TransitViewSecret.ts
@@ -1,4 +1,4 @@
-import { Page } from "../../PageSystem/Page";
+import { Page } from "../../types/Page";
 import { SecretTitleElement } from "../../elements/SecretTitleElement";
 import { Tile } from "../../elements/Tile";
 import { getTransitKey } from "../../api/transit/getTransitKey";
diff --git a/src/pages/Unseal.ts b/src/pages/Unseal.ts
index 3e5b2d0..139f52e 100644
--- a/src/pages/Unseal.ts
+++ b/src/pages/Unseal.ts
@@ -1,5 +1,5 @@
 import { MarginInline } from "../elements/MarginInline";
-import { Page } from "../PageSystem/Page";
+import { Page } from "../types/Page";
 import { QRScanner, QRScannerType } from "../elements/QRScanner";
 import { SealStatusType, getSealStatus } from "../api/sys/getSealStatus";
 import { makeElement } from "../htmlUtils";
diff --git a/src/PageSystem/Page.ts b/src/types/Page.ts
similarity index 91%
rename from src/PageSystem/Page.ts
rename to src/types/Page.ts
index a617808..a9e895e 100644
--- a/src/PageSystem/Page.ts
+++ b/src/types/Page.ts
@@ -1,4 +1,4 @@
-import { PageRouter } from "./PageRouter";
+import { PageRouter } from "../PageSystem/PageRouter";
 import { PageState } from "../PageState";
 
 export class Page {