diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
index cf4d50a..beac171 100644
--- a/PHP Monitor.xcodeproj/project.pbxproj	
+++ b/PHP Monitor.xcodeproj/project.pbxproj	
@@ -1340,6 +1340,7 @@
 				C4B5853A2770FE2500DA4FBE /* Common */,
 				C41E181722CB61EB0072CF09 /* Domain */,
 				54D9E0BE27E4F5C0003B9AD9 /* Vendor */,
+				C44DFA832A6706A200B98ED5 /* Modules */,
 				C41C1B3F22B0098000E7CF16 /* Info.plist */,
 				C4232EE42612526500158FC6 /* Credits.html */,
 				C41C1B4022B0098000E7CF16 /* phpmon.entitlements */,
@@ -1366,10 +1367,8 @@
 				C4B13B1D25C4915000548C3A /* App */,
 				C4D9ADBD27761084007277F4 /* PHP */,
 				C47331A0247093AC009A0597 /* Menu */,
-				C464ADAA275A7A25003FCD53 /* DomainList */,
-				C44A874628905B8500498BC4 /* Onboarding */,
 				5420395726135DB800FB00FA /* Preferences */,
-				C44C198F276E3A380072762D /* Progress */,
+				C44C198F276E3A380072762D /* Terminal Alert */,
 				C4C8E81D276F5686003AC782 /* Watcher */,
 				C40C5C9E2846A42D00E28255 /* Presets */,
 				C4EE55B027708BB2001DF387 /* SwiftUI */,
@@ -1424,22 +1423,14 @@
 			path = Common;
 			sourceTree = "<group>";
 		};
-		C44A874628905B8500498BC4 /* Onboarding */ = {
-			isa = PBXGroup;
-			children = (
-				C4FACE82288F1F9700FC478F /* OnboardingWindowController.swift */,
-			);
-			path = Onboarding;
-			sourceTree = "<group>";
-		};
-		C44C198F276E3A380072762D /* Progress */ = {
+		C44C198F276E3A380072762D /* Terminal Alert */ = {
 			isa = PBXGroup;
 			children = (
 				C44C198C276E3A1C0072762D /* TerminalProgressWindowController.swift */,
 				C44A874728905BB000498BC4 /* ProgressVC.swift */,
 				C44C1990276E44CB0072762D /* ProgressWindow.storyboard */,
 			);
-			path = Progress;
+			path = "Terminal Alert";
 			sourceTree = "<group>";
 		};
 		C44CCD4327AFE93300CE40E5 /* Errors */ = {
@@ -1520,6 +1511,8 @@
 		C44DFA832A6706A200B98ED5 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				C4E9D2BE2878B32D008FFDAD /* Onboarding */,
+				C464ADAA275A7A25003FCD53 /* Domain List */,
 				C44DFA7A2A6703FD00B98ED5 /* PHP Config Editor */,
 				C4297F7828970D4E004C4630 /* PHP Doctor */,
 				C43931C329C4BD510069165B /* PHP Version Manager */,
@@ -1534,6 +1527,30 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
+		C44DFA852A67090A00B98ED5 /* UI */ = {
+			isa = PBXGroup;
+			children = (
+				C464ADAB275A7A3F003FCD53 /* DomainListWindowController.swift */,
+				C464ADAE275A7A69003FCD53 /* DomainListVC.swift */,
+				C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */,
+				C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */,
+				C4FE011028084FC200D1DE6D /* SelectionVC.swift */,
+				C4930849279F331F009C240B /* AddSiteVC.swift */,
+				C4D9F24A280B69E100DCD39A /* AddProxyVC.swift */,
+				C44067F327E256560045BD4E /* Cells */,
+				C44DFA872A67092300B98ED5 /* Subclass */,
+			);
+			path = UI;
+			sourceTree = "<group>";
+		};
+		C44DFA872A67092300B98ED5 /* Subclass */ = {
+			isa = PBXGroup;
+			children = (
+				C4A81CA328C67101008DD9D1 /* PMTableView.swift */,
+			);
+			path = Subclass;
+			sourceTree = "<group>";
+		};
 		C44F868C2835BD60005C353A /* phpmon */ = {
 			isa = PBXGroup;
 			children = (
@@ -1612,20 +1629,12 @@
 			path = Behaviors;
 			sourceTree = "<group>";
 		};
-		C464ADAA275A7A25003FCD53 /* DomainList */ = {
+		C464ADAA275A7A25003FCD53 /* Domain List */ = {
 			isa = PBXGroup;
 			children = (
-				C44067F327E256560045BD4E /* Cells */,
-				C464ADAB275A7A3F003FCD53 /* DomainListWindowController.swift */,
-				C464ADAE275A7A69003FCD53 /* DomainListVC.swift */,
-				C41E87192763D42300161EE0 /* DomainListVC+ContextMenu.swift */,
-				C41CA5EC2774F8EE00A2C80E /* DomainListVC+Actions.swift */,
-				C4FE011028084FC200D1DE6D /* SelectionVC.swift */,
-				C4930849279F331F009C240B /* AddSiteVC.swift */,
-				C4D9F24A280B69E100DCD39A /* AddProxyVC.swift */,
-				C4A81CA328C67101008DD9D1 /* PMTableView.swift */,
+				C44DFA852A67090A00B98ED5 /* UI */,
 			);
-			path = DomainList;
+			path = "Domain List";
 			sourceTree = "<group>";
 		};
 		C471E6D928F9AFC20021E251 /* Testables */ = {
@@ -1823,10 +1832,10 @@
 		C4B609172853AA9E00C95265 /* Menu */ = {
 			isa = PBXGroup;
 			children = (
+				C4EB53E428551F9B006F9937 /* HeaderView.swift */,
+				C4B609192853AAD300C95265 /* SectionHeaderView.swift */,
 				C4B6091C2853AB9700C95265 /* ServicesView.swift */,
 				C4709CA128524B3400088BB8 /* StatsView.swift */,
-				C4B609192853AAD300C95265 /* SectionHeaderView.swift */,
-				C4EB53E428551F9B006F9937 /* HeaderView.swift */,
 			);
 			path = Menu;
 			sourceTree = "<group>";
@@ -1990,6 +1999,7 @@
 		C4E9D2BE2878B32D008FFDAD /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
+				C4FACE82288F1F9700FC478F /* OnboardingWindowController.swift */,
 				C4E9D2BF2878B336008FFDAD /* OnboardingView.swift */,
 			);
 			path = Onboarding;
@@ -1998,8 +2008,6 @@
 		C4EE55B027708BB2001DF387 /* SwiftUI */ = {
 			isa = PBXGroup;
 			children = (
-				C44DFA832A6706A200B98ED5 /* Modules */,
-				C4E9D2BE2878B32D008FFDAD /* Onboarding */,
 				C4B609182853AAA700C95265 /* Domains */,
 				C4B609172853AA9E00C95265 /* Menu */,
 				C490E3A329BC92E6006D2DE6 /* Progress */,
diff --git a/phpmon/Domain/Progress/ProgressVC.swift b/phpmon/Domain/Terminal Alert/ProgressVC.swift
similarity index 100%
rename from phpmon/Domain/Progress/ProgressVC.swift
rename to phpmon/Domain/Terminal Alert/ProgressVC.swift
diff --git a/phpmon/Domain/Progress/ProgressWindow.storyboard b/phpmon/Domain/Terminal Alert/ProgressWindow.storyboard
similarity index 98%
rename from phpmon/Domain/Progress/ProgressWindow.storyboard
rename to phpmon/Domain/Terminal Alert/ProgressWindow.storyboard
index 67ff33f..56a7c3c 100644
--- a/phpmon/Domain/Progress/ProgressWindow.storyboard
+++ b/phpmon/Domain/Terminal Alert/ProgressWindow.storyboard	
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
diff --git a/phpmon/Domain/Progress/TerminalProgressWindowController.swift b/phpmon/Domain/Terminal Alert/TerminalProgressWindowController.swift
similarity index 100%
rename from phpmon/Domain/Progress/TerminalProgressWindowController.swift
rename to phpmon/Domain/Terminal Alert/TerminalProgressWindowController.swift
diff --git a/phpmon/Domain/DomainList/AddProxyVC.swift b/phpmon/Modules/Domain List/UI/AddProxyVC.swift
similarity index 100%
rename from phpmon/Domain/DomainList/AddProxyVC.swift
rename to phpmon/Modules/Domain List/UI/AddProxyVC.swift
diff --git a/phpmon/Domain/DomainList/AddSiteVC.swift b/phpmon/Modules/Domain List/UI/AddSiteVC.swift
similarity index 100%
rename from phpmon/Domain/DomainList/AddSiteVC.swift
rename to phpmon/Modules/Domain List/UI/AddSiteVC.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListCellProtocol.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListCellProtocol.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListCellProtocol.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListCellProtocol.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListKindCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListKindCell.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListKindCell.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListNameCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListNameCell.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListNameCell.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListNameCell.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListPhpCell.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListPhpCell.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListTLSCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListTLSCell.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListTLSCell.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListTLSCell.swift
diff --git a/phpmon/Domain/DomainList/Cells/DomainListTypeCell.swift b/phpmon/Modules/Domain List/UI/Cells/DomainListTypeCell.swift
similarity index 100%
rename from phpmon/Domain/DomainList/Cells/DomainListTypeCell.swift
rename to phpmon/Modules/Domain List/UI/Cells/DomainListTypeCell.swift
diff --git a/phpmon/Domain/DomainList/DomainListVC+Actions.swift b/phpmon/Modules/Domain List/UI/DomainListVC+Actions.swift
similarity index 100%
rename from phpmon/Domain/DomainList/DomainListVC+Actions.swift
rename to phpmon/Modules/Domain List/UI/DomainListVC+Actions.swift
diff --git a/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift b/phpmon/Modules/Domain List/UI/DomainListVC+ContextMenu.swift
similarity index 100%
rename from phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift
rename to phpmon/Modules/Domain List/UI/DomainListVC+ContextMenu.swift
diff --git a/phpmon/Domain/DomainList/DomainListVC.swift b/phpmon/Modules/Domain List/UI/DomainListVC.swift
similarity index 100%
rename from phpmon/Domain/DomainList/DomainListVC.swift
rename to phpmon/Modules/Domain List/UI/DomainListVC.swift
diff --git a/phpmon/Domain/DomainList/DomainListWindowController.swift b/phpmon/Modules/Domain List/UI/DomainListWindowController.swift
similarity index 100%
rename from phpmon/Domain/DomainList/DomainListWindowController.swift
rename to phpmon/Modules/Domain List/UI/DomainListWindowController.swift
diff --git a/phpmon/Domain/DomainList/SelectionVC.swift b/phpmon/Modules/Domain List/UI/SelectionVC.swift
similarity index 100%
rename from phpmon/Domain/DomainList/SelectionVC.swift
rename to phpmon/Modules/Domain List/UI/SelectionVC.swift
diff --git a/phpmon/Domain/DomainList/PMTableView.swift b/phpmon/Modules/Domain List/UI/Subclass/PMTableView.swift
similarity index 100%
rename from phpmon/Domain/DomainList/PMTableView.swift
rename to phpmon/Modules/Domain List/UI/Subclass/PMTableView.swift
diff --git a/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift b/phpmon/Modules/Onboarding/OnboardingView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift
rename to phpmon/Modules/Onboarding/OnboardingView.swift
diff --git a/phpmon/Domain/Onboarding/OnboardingWindowController.swift b/phpmon/Modules/Onboarding/OnboardingWindowController.swift
similarity index 100%
rename from phpmon/Domain/Onboarding/OnboardingWindowController.swift
rename to phpmon/Modules/Onboarding/OnboardingWindowController.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Config Editor/UI/ConfigManagerView.swift b/phpmon/Modules/PHP Config Editor/UI/ConfigManagerView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Config Editor/UI/ConfigManagerView.swift
rename to phpmon/Modules/PHP Config Editor/UI/ConfigManagerView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/PhpConfigChecker.swift b/phpmon/Modules/PHP Doctor/Data/PhpConfigChecker.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/PhpConfigChecker.swift
rename to phpmon/Modules/PHP Doctor/Data/PhpConfigChecker.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/Warning.swift b/phpmon/Modules/PHP Doctor/Data/Warning.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/Warning.swift
rename to phpmon/Modules/PHP Doctor/Data/Warning.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/WarningManager.swift b/phpmon/Modules/PHP Doctor/Data/WarningManager.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/Data/WarningManager.swift
rename to phpmon/Modules/PHP Doctor/Data/WarningManager.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/NoWarningsView.swift b/phpmon/Modules/PHP Doctor/UI/NoWarningsView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/NoWarningsView.swift
rename to phpmon/Modules/PHP Doctor/UI/NoWarningsView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/PhpDoctorView.swift b/phpmon/Modules/PHP Doctor/UI/PhpDoctorView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/PhpDoctorView.swift
rename to phpmon/Modules/PHP Doctor/UI/PhpDoctorView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/PhpDoctorWindowController.swift b/phpmon/Modules/PHP Doctor/UI/PhpDoctorWindowController.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/PhpDoctorWindowController.swift
rename to phpmon/Modules/PHP Doctor/UI/PhpDoctorWindowController.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/WarningView.swift b/phpmon/Modules/PHP Doctor/UI/WarningView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Doctor/UI/WarningView.swift
rename to phpmon/Modules/PHP Doctor/UI/WarningView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/BrewFormula+UI.swift b/phpmon/Modules/PHP Version Manager/Data/BrewFormula+UI.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/BrewFormula+UI.swift
rename to phpmon/Modules/PHP Version Manager/Data/BrewFormula+UI.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/Fake/FakeBrewFormulaeHandler.swift b/phpmon/Modules/PHP Version Manager/Data/Fake/FakeBrewFormulaeHandler.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/Fake/FakeBrewFormulaeHandler.swift
rename to phpmon/Modules/PHP Version Manager/Data/Fake/FakeBrewFormulaeHandler.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/PhpFormulaeStatus.swift b/phpmon/Modules/PHP Version Manager/Data/PhpFormulaeStatus.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/Data/PhpFormulaeStatus.swift
rename to phpmon/Modules/PHP Version Manager/Data/PhpFormulaeStatus.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/BlockingOverlayView.swift b/phpmon/Modules/PHP Version Manager/UI/BlockingOverlayView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/BlockingOverlayView.swift
rename to phpmon/Modules/PHP Version Manager/UI/BlockingOverlayView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift b/phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift
rename to phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerView.swift
diff --git a/phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/PhpVersionManagerWindowController.swift b/phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerWindowController.swift
similarity index 100%
rename from phpmon/Domain/SwiftUI/Modules/PHP Version Manager/UI/PhpVersionManagerWindowController.swift
rename to phpmon/Modules/PHP Version Manager/UI/PhpVersionManagerWindowController.swift