diff --git a/Secretive.xcodeproj/project.pbxproj b/Secretive.xcodeproj/project.pbxproj
index b87464c..45eccf9 100644
--- a/Secretive.xcodeproj/project.pbxproj
+++ b/Secretive.xcodeproj/project.pbxproj
@@ -305,14 +305,8 @@
 			isa = PBXGroup;
 			children = (
 				50617D8223FCE48E0099B055 /* AppDelegate.swift */,
-				50617D8423FCE48E0099B055 /* ContentView.swift */,
-				50731668241E00C20023809E /* NoticeView.swift */,
-				50C385A42407A76D00AF2719 /* SecretDetailView.swift */,
-				5099A02323FD2AAA0062B6F2 /* CreateSecretView.swift */,
-				50B8550C24138C4F009958AC /* DeleteSecretView.swift */,
-				50BB046A2418AAAE00D6E079 /* EmptyStoreView.swift */,
-				50C385A8240B636500AF2719 /* SetupView.swift */,
-				50731665241DF8660023809E /* Updater.swift */,
+				508A58B0241ED1C40069DC07 /* Views */,
+				508A58B1241ED1EA0069DC07 /* Controllers */,
 				50617D8623FCE48E0099B055 /* Assets.xcassets */,
 				50617D8B23FCE48E0099B055 /* Main.storyboard */,
 				50617D8E23FCE48E0099B055 /* Info.plist */,
@@ -400,6 +394,28 @@
 			path = Config;
 			sourceTree = "<group>";
 		};
+		508A58B0241ED1C40069DC07 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				50617D8423FCE48E0099B055 /* ContentView.swift */,
+				50731668241E00C20023809E /* NoticeView.swift */,
+				50C385A42407A76D00AF2719 /* SecretDetailView.swift */,
+				5099A02323FD2AAA0062B6F2 /* CreateSecretView.swift */,
+				50B8550C24138C4F009958AC /* DeleteSecretView.swift */,
+				50BB046A2418AAAE00D6E079 /* EmptyStoreView.swift */,
+				50C385A8240B636500AF2719 /* SetupView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		508A58B1241ED1EA0069DC07 /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				50731665241DF8660023809E /* Updater.swift */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
 		5099A02523FE34DE0062B6F2 /* SmartCard */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/Secretive/Updater.swift b/Secretive/Controllers/Updater.swift
similarity index 100%
rename from Secretive/Updater.swift
rename to Secretive/Controllers/Updater.swift
diff --git a/Secretive/ContentView.swift b/Secretive/Views/ContentView.swift
similarity index 100%
rename from Secretive/ContentView.swift
rename to Secretive/Views/ContentView.swift
diff --git a/Secretive/CreateSecretView.swift b/Secretive/Views/CreateSecretView.swift
similarity index 100%
rename from Secretive/CreateSecretView.swift
rename to Secretive/Views/CreateSecretView.swift
diff --git a/Secretive/DeleteSecretView.swift b/Secretive/Views/DeleteSecretView.swift
similarity index 100%
rename from Secretive/DeleteSecretView.swift
rename to Secretive/Views/DeleteSecretView.swift
diff --git a/Secretive/EmptyStoreView.swift b/Secretive/Views/EmptyStoreView.swift
similarity index 100%
rename from Secretive/EmptyStoreView.swift
rename to Secretive/Views/EmptyStoreView.swift
diff --git a/Secretive/NoticeView.swift b/Secretive/Views/NoticeView.swift
similarity index 100%
rename from Secretive/NoticeView.swift
rename to Secretive/Views/NoticeView.swift
diff --git a/Secretive/SecretDetailView.swift b/Secretive/Views/SecretDetailView.swift
similarity index 100%
rename from Secretive/SecretDetailView.swift
rename to Secretive/Views/SecretDetailView.swift
diff --git a/Secretive/SetupView.swift b/Secretive/Views/SetupView.swift
similarity index 100%
rename from Secretive/SetupView.swift
rename to Secretive/Views/SetupView.swift