diff --git a/QueueCube.xcodeproj/project.pbxproj b/QueueCube.xcodeproj/project.pbxproj
index bb48242..68ddcd4 100644
--- a/QueueCube.xcodeproj/project.pbxproj
+++ b/QueueCube.xcodeproj/project.pbxproj
@@ -14,7 +14,7 @@
 		CD8ACBBF2DC5B8F2008BF856 /* Exceptions for "QueueCube" folder in "QueueCube" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
-				Info.plist,
+				App/Info.plist,
 			);
 			target = CD4E9B962D7691C20066FC17 /* QueueCube */;
 		};
@@ -271,7 +271,7 @@
 				DEVELOPMENT_TEAM = DQQH5H6GBD;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = QueueCube/Info.plist;
+				INFOPLIST_FILE = QueueCube/App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -306,7 +306,7 @@
 				DEVELOPMENT_TEAM = DQQH5H6GBD;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = QueueCube/Info.plist;
+				INFOPLIST_FILE = QueueCube/App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
diff --git a/QueueCube/Assets.xcassets/AccentColor.colorset/Contents.json b/QueueCube/App/Assets.xcassets/AccentColor.colorset/Contents.json
similarity index 100%
rename from QueueCube/Assets.xcassets/AccentColor.colorset/Contents.json
rename to QueueCube/App/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/QueueCube/Assets.xcassets/AppIcon.appiconset/Contents.json b/QueueCube/App/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from QueueCube/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to QueueCube/App/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/QueueCube/Assets.xcassets/Contents.json b/QueueCube/App/Assets.xcassets/Contents.json
similarity index 100%
rename from QueueCube/Assets.xcassets/Contents.json
rename to QueueCube/App/Assets.xcassets/Contents.json
diff --git a/QueueCube/Info.plist b/QueueCube/App/Info.plist
similarity index 100%
rename from QueueCube/Info.plist
rename to QueueCube/App/Info.plist
diff --git a/QueueCube/QueueCubeApp.swift b/QueueCube/App/QueueCubeApp.swift
similarity index 100%
rename from QueueCube/QueueCubeApp.swift
rename to QueueCube/App/QueueCubeApp.swift
diff --git a/QueueCube/API.swift b/QueueCube/Backend/API.swift
similarity index 100%
rename from QueueCube/API.swift
rename to QueueCube/Backend/API.swift
diff --git a/QueueCube/Backend/Settings.swift b/QueueCube/Backend/Settings.swift
new file mode 100644
index 0000000..ee4de0b
--- /dev/null
+++ b/QueueCube/Backend/Settings.swift
@@ -0,0 +1,35 @@
+//
+//  Settings.swift
+//  QueueCube
+//
+//  Created by James Magahern on 6/10/25.
+//
+
+import Foundation
+
+struct Settings
+{
+    var serverURL: String?
+    
+    static func fromDefaults() -> Settings {
+        let serverURL = UserDefaults.standard.string(forKey: Keys.serverURL.rawValue)
+        return Settings(serverURL: serverURL)
+    }
+    
+    func save() {
+        UserDefaults.standard.set(serverURL, forKey: Keys.serverURL.rawValue)
+        NotificationCenter.default.post(name: .settingsChanged, object: nil)
+    }
+    
+    // MARK: - Types
+    
+    enum Keys: String
+    {
+        case serverURL
+    }
+}
+
+extension Notification.Name
+{
+    static let settingsChanged = Notification.Name("settingsChanged")
+}
diff --git a/QueueCube/Utilities.swift b/QueueCube/Backend/Utilities.swift
similarity index 79%
rename from QueueCube/Utilities.swift
rename to QueueCube/Backend/Utilities.swift
index 154e7f9..d7a7ca2 100644
--- a/QueueCube/Utilities.swift
+++ b/QueueCube/Backend/Utilities.swift
@@ -7,33 +7,6 @@
 
 import Foundation
 
-struct Settings
-{
-    var serverURL: String?
-    
-    static func fromDefaults() -> Settings {
-        let serverURL = UserDefaults.standard.string(forKey: Keys.serverURL.rawValue)
-        return Settings(serverURL: serverURL)
-    }
-    
-    func save() {
-        UserDefaults.standard.set(serverURL, forKey: Keys.serverURL.rawValue)
-        NotificationCenter.default.post(name: .settingsChanged, object: nil)
-    }
-    
-    // MARK: - Types
-    
-    enum Keys: String
-    {
-        case serverURL
-    }
-}
-
-extension Notification.Name
-{
-    static let settingsChanged = Notification.Name("settingsChanged")
-}
-
 extension Optional
 {
     func try_unwrap() throws -> Wrapped {
diff --git a/QueueCube/AddMediaBarView.swift b/QueueCube/Views/AddMediaBarView.swift
similarity index 100%
rename from QueueCube/AddMediaBarView.swift
rename to QueueCube/Views/AddMediaBarView.swift
diff --git a/QueueCube/ContentView.swift b/QueueCube/Views/ContentView.swift
similarity index 100%
rename from QueueCube/ContentView.swift
rename to QueueCube/Views/ContentView.swift
diff --git a/QueueCube/NowPlayingView.swift b/QueueCube/Views/NowPlayingView.swift
similarity index 100%
rename from QueueCube/NowPlayingView.swift
rename to QueueCube/Views/NowPlayingView.swift
diff --git a/QueueCube/PlaylistView.swift b/QueueCube/Views/PlaylistView.swift
similarity index 100%
rename from QueueCube/PlaylistView.swift
rename to QueueCube/Views/PlaylistView.swift
diff --git a/QueueCube/SettingsView.swift b/QueueCube/Views/SettingsView.swift
similarity index 100%
rename from QueueCube/SettingsView.swift
rename to QueueCube/Views/SettingsView.swift