diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index 8f51fbae..5b94036a 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -123,13 +123,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		A80900D12AA3F9F20085C63B /* Views */ = {
+		A80900D12AA3F9F20085C63B /* Extras */ = {
 			isa = PBXGroup;
 			children = (
+				A8E6D2002A416494005751D4 /* LoopTriggerKeys.swift */,
+				A8504D2C2A85832F00C2EFDA /* SoftwareUpdater.swift */,
 				A80900D22AA3F9F20085C63B /* BetaIndicator.swift */,
 				A80900D32AA3F9F20085C63B /* VisualEffectView.swift */,
 			);
-			path = Views;
+			path = Extras;
 			sourceTree = "<group>";
 		};
 		A82521EA29E2349700139654 /* About Window */ = {
@@ -141,22 +143,15 @@
 			path = "About Window";
 			sourceTree = "<group>";
 		};
-		A8330ABB2A3AC05200673C8D /* Helpers */ = {
+		A8330ABB2A3AC05200673C8D /* Managers */ = {
 			isa = PBXGroup;
 			children = (
 				A848D8A62A8C2F3F00060834 /* LoopManager.swift */,
-				A86CB7322A3D22E7006A78F2 /* WindowEngine.swift */,
-				A87376F52AA288EB001890F4 /* Window.swift */,
-				A8878A242AA3B2C800850A66 /* WindowTransformAnimation.swift */,
-				A8330AD32A3AC27600673C8D /* WindowDirection.swift */,
 				A8A2ABE62A3FB0370067B5A9 /* KeybindMonitor.swift */,
 				A82521ED29E235AC00139654 /* PermissionsManager.swift */,
 				A8EF1F08299C87DF00633440 /* IconManager.swift */,
-				A8E6D2002A416494005751D4 /* LoopTriggerKeys.swift */,
-				A8504D2C2A85832F00C2EFDA /* SoftwareUpdater.swift */,
-				A80900D12AA3F9F20085C63B /* Views */,
 			);
-			path = Helpers;
+			path = Managers;
 			sourceTree = "<group>";
 		};
 		A8330AD52A3AC29C00673C8D /* Extensions */ = {
@@ -177,6 +172,17 @@
 			path = Extensions;
 			sourceTree = "<group>";
 		};
+		A864F4662AA65EC200579738 /* Window */ = {
+			isa = PBXGroup;
+			children = (
+				A86CB7322A3D22E7006A78F2 /* WindowEngine.swift */,
+				A87376F52AA288EB001890F4 /* Window.swift */,
+				A8878A242AA3B2C800850A66 /* WindowTransformAnimation.swift */,
+				A8330AD32A3AC27600673C8D /* WindowDirection.swift */,
+			);
+			path = Window;
+			sourceTree = "<group>";
+		};
 		A88265FA29808DED00BCB197 /* Preview Window */ = {
 			isa = PBXGroup;
 			children = (
@@ -202,21 +208,13 @@
 			isa = PBXGroup;
 			children = (
 				A88265FF2980931C00BCB197 /* SettingsView.swift */,
-				A882660429809F4E00BCB197 /* Views */,
-			);
-			path = Settings;
-			sourceTree = "<group>";
-		};
-		A882660429809F4E00BCB197 /* Views */ = {
-			isa = PBXGroup;
-			children = (
 				A882660729809F6F00BCB197 /* GeneralSettingsView.swift */,
 				A8DCC9872981B9E100D41065 /* RadialMenuSettingsView.swift */,
 				A8DCC9892981F43F00D41065 /* PreviewSettingsView.swift */,
 				A87D36972980A89D002B0D2F /* KeybindingSettingsView.swift */,
 				A8F0636C2985AF1F0010C33D /* MoreSettingsView.swift */,
 			);
-			path = Views;
+			path = Settings;
 			sourceTree = "<group>";
 		};
 		A883642D298B7288005D6C19 /* Frameworks */ = {
@@ -253,11 +251,13 @@
 				A80521312A84878200BF7E22 /* Config.xcconfig */,
 				A8E59C38297F5E9A0064D4BA /* LoopApp.swift */,
 				A80397D32A932993006D2796 /* MenubarIconView.swift */,
-				A8330ABB2A3AC05200673C8D /* Helpers */,
+				A864F4662AA65EC200579738 /* Window */,
+				A8330ABB2A3AC05200673C8D /* Managers */,
 				A82521EA29E2349700139654 /* About Window */,
 				A88265FB29808E0D00BCB197 /* Radial Menu */,
 				A88265FA29808DED00BCB197 /* Preview Window */,
 				A88265FC298092B500BCB197 /* Settings */,
+				A80900D12AA3F9F20085C63B /* Extras */,
 				A8330AD52A3AC29C00673C8D /* Extensions */,
 				A8E59C3C297F5E9B0064D4BA /* Assets.xcassets */,
 				A8F063712985B2730010C33D /* Info.plist */,
diff --git a/Loop/Helpers/Views/BetaIndicator.swift b/Loop/Extras/BetaIndicator.swift
similarity index 100%
rename from Loop/Helpers/Views/BetaIndicator.swift
rename to Loop/Extras/BetaIndicator.swift
diff --git a/Loop/Helpers/LoopTriggerKeys.swift b/Loop/Extras/LoopTriggerKeys.swift
similarity index 100%
rename from Loop/Helpers/LoopTriggerKeys.swift
rename to Loop/Extras/LoopTriggerKeys.swift
diff --git a/Loop/Helpers/SoftwareUpdater.swift b/Loop/Extras/SoftwareUpdater.swift
similarity index 100%
rename from Loop/Helpers/SoftwareUpdater.swift
rename to Loop/Extras/SoftwareUpdater.swift
diff --git a/Loop/Helpers/Views/VisualEffectView.swift b/Loop/Extras/VisualEffectView.swift
similarity index 100%
rename from Loop/Helpers/Views/VisualEffectView.swift
rename to Loop/Extras/VisualEffectView.swift
diff --git a/Loop/Helpers/IconManager.swift b/Loop/Managers/IconManager.swift
similarity index 100%
rename from Loop/Helpers/IconManager.swift
rename to Loop/Managers/IconManager.swift
diff --git a/Loop/Helpers/KeybindMonitor.swift b/Loop/Managers/KeybindMonitor.swift
similarity index 100%
rename from Loop/Helpers/KeybindMonitor.swift
rename to Loop/Managers/KeybindMonitor.swift
diff --git a/Loop/Helpers/LoopManager.swift b/Loop/Managers/LoopManager.swift
similarity index 100%
rename from Loop/Helpers/LoopManager.swift
rename to Loop/Managers/LoopManager.swift
diff --git a/Loop/Helpers/PermissionsManager.swift b/Loop/Managers/PermissionsManager.swift
similarity index 100%
rename from Loop/Helpers/PermissionsManager.swift
rename to Loop/Managers/PermissionsManager.swift
diff --git a/Loop/Settings/Views/GeneralSettingsView.swift b/Loop/Settings/GeneralSettingsView.swift
similarity index 100%
rename from Loop/Settings/Views/GeneralSettingsView.swift
rename to Loop/Settings/GeneralSettingsView.swift
diff --git a/Loop/Settings/Views/KeybindingSettingsView.swift b/Loop/Settings/KeybindingSettingsView.swift
similarity index 100%
rename from Loop/Settings/Views/KeybindingSettingsView.swift
rename to Loop/Settings/KeybindingSettingsView.swift
diff --git a/Loop/Settings/Views/MoreSettingsView.swift b/Loop/Settings/MoreSettingsView.swift
similarity index 100%
rename from Loop/Settings/Views/MoreSettingsView.swift
rename to Loop/Settings/MoreSettingsView.swift
diff --git a/Loop/Settings/Views/PreviewSettingsView.swift b/Loop/Settings/PreviewSettingsView.swift
similarity index 100%
rename from Loop/Settings/Views/PreviewSettingsView.swift
rename to Loop/Settings/PreviewSettingsView.swift
diff --git a/Loop/Settings/Views/RadialMenuSettingsView.swift b/Loop/Settings/RadialMenuSettingsView.swift
similarity index 100%
rename from Loop/Settings/Views/RadialMenuSettingsView.swift
rename to Loop/Settings/RadialMenuSettingsView.swift
diff --git a/Loop/Helpers/Window.swift b/Loop/Window/Window.swift
similarity index 100%
rename from Loop/Helpers/Window.swift
rename to Loop/Window/Window.swift
diff --git a/Loop/Helpers/WindowDirection.swift b/Loop/Window/WindowDirection.swift
similarity index 100%
rename from Loop/Helpers/WindowDirection.swift
rename to Loop/Window/WindowDirection.swift
diff --git a/Loop/Helpers/WindowEngine.swift b/Loop/Window/WindowEngine.swift
similarity index 100%
rename from Loop/Helpers/WindowEngine.swift
rename to Loop/Window/WindowEngine.swift
diff --git a/Loop/Helpers/WindowTransformAnimation.swift b/Loop/Window/WindowTransformAnimation.swift
similarity index 100%
rename from Loop/Helpers/WindowTransformAnimation.swift
rename to Loop/Window/WindowTransformAnimation.swift