diff --git a/DNSecure.xcodeproj/project.pbxproj b/DNSecure.xcodeproj/project.pbxproj
index 5477d4b..0f24fbe 100644
--- a/DNSecure.xcodeproj/project.pbxproj
+++ b/DNSecure.xcodeproj/project.pbxproj
@@ -7,21 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		890B80D5251DC3A20046BAA0 /* DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B80D4251DC3A20046BAA0 /* DetailView.swift */; };
-		890B80DF251DC6B50046BAA0 /* Presets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B80DE251DC6B50046BAA0 /* Presets.swift */; };
-		893AA853258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */; };
-		893AA858258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */; };
-		893AA85D258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */; };
-		893AA862258F998C0060B022 /* NEOnDemandRuleInterfaceType+isSSIDUsed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+isSSIDUsed.swift */; };
-		893AA867258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */; };
-		893AA86C258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */; };
-		893AA871258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */; };
-		8940023C24ACBD2700EBE74B /* DNSecureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940023B24ACBD2700EBE74B /* DNSecureApp.swift */; };
-		8940023E24ACBD2700EBE74B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940023D24ACBD2700EBE74B /* ContentView.swift */; };
-		8940024024ACBD2800EBE74B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8940023F24ACBD2800EBE74B /* Assets.xcassets */; };
-		8940024324ACBD2800EBE74B /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8940024224ACBD2800EBE74B /* Preview Assets.xcassets */; };
-		8940024E24ACBD2800EBE74B /* DNSecureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940024D24ACBD2800EBE74B /* DNSecureTests.swift */; };
-		8940025924ACBD2800EBE74B /* DNSecureUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8940025824ACBD2800EBE74B /* DNSecureUITests.swift */; };
 		8940026924ACBE4900EBE74B /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8940026824ACBE4900EBE74B /* NetworkExtension.framework */; };
 /* End PBXBuildFile section */
 
@@ -44,13 +29,6 @@
 
 /* Begin PBXFileReference section */
 		8924EDF324C9CDF1004AF871 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+CaseIterable.swift"; sourceTree = "<group>"; };
-		893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+CustomStringConvertible.swift"; sourceTree = "<group>"; };
-		893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+Codable.swift"; sourceTree = "<group>"; };
-		893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+isSSIDUsed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleInterfaceType+isSSIDUsed.swift"; sourceTree = "<group>"; };
-		893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+CaseIterable.swift"; sourceTree = "<group>"; };
-		893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+CustomStringConvertible.swift"; sourceTree = "<group>"; };
-		893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NEOnDemandRuleAction+Codable.swift"; sourceTree = "<group>"; };
 		8940023824ACBD2700EBE74B /* DNSecure.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DNSecure.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8940024924ACBD2800EBE74B /* DNSecureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DNSecureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8940025424ACBD2800EBE74B /* DNSecureUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DNSecureUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -65,26 +43,12 @@
 			);
 			target = 8940023724ACBD2700EBE74B /* DNSecure */;
 		};
-		899AD0442E66100E00449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				DNSecureTests.swift,
-			);
-			target = 8940024824ACBD2800EBE74B /* DNSecureTests */;
-		};
-		899AD0492E66101100449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				DNSecureUITests.swift,
-			);
-			target = 8940025324ACBD2800EBE74B /* DNSecureUITests */;
-		};
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		899AD0232E66100500449710 /* DNSecure */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (899AD03F2E66100500449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecure; sourceTree = "<group>"; };
-		899AD0422E66100E00449710 /* DNSecureTests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (899AD0442E66100E00449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecureTests; sourceTree = "<group>"; };
-		899AD0472E66101100449710 /* DNSecureUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (899AD0492E66101100449710 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = DNSecureUITests; sourceTree = "<group>"; };
+		899AD0422E66100E00449710 /* DNSecureTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = DNSecureTests; sourceTree = "<group>"; };
+		899AD0472E66101100449710 /* DNSecureUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = DNSecureUITests; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -113,45 +77,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		893AA816258F790D0060B022 /* Views */ = {
-			isa = PBXGroup;
-			children = (
-				894F33642C46D2A20060F385 /* RestorationView.swift */,
-				8940023D24ACBD2700EBE74B /* ContentView.swift */,
-				89CB922025209DD100B6983C /* HowToActivateView.swift */,
-				890B80D4251DC3A20046BAA0 /* DetailView.swift */,
-				894958AC2548405E009691D5 /* RuleView.swift */,
-				8998041528DCDED800C8B421 /* DoTSections.swift */,
-				8998041728DCDEEF00C8B421 /* DoHSections.swift */,
-				89E8B71929F80164002C2AEF /* LazyTextField.swift */,
-			);
-			path = Views;
-			sourceTree = "<group>";
-		};
-		893AA817258F79F70060B022 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				8986CDCE251D9B3400D947CD /* Resolver.swift */,
-				890B80DE251DC6B50046BAA0 /* Presets.swift */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
-		893AA818258F7A0C0060B022 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				8963FDFA251DF1BC00E3DFE7 /* Bundle+displayName.swift */,
-				893AA852258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift */,
-				893AA857258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift */,
-				893AA85C258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift */,
-				893AA861258F998C0060B022 /* NEOnDemandRuleInterfaceType+isSSIDUsed.swift */,
-				893AA866258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift */,
-				893AA86B258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift */,
-				893AA870258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift */,
-			);
-			path = Extensions;
-			sourceTree = "<group>";
-		};
 		8940022F24ACBD2700EBE74B = {
 			isa = PBXGroup;
 			children = (
@@ -218,6 +143,9 @@
 			dependencies = (
 				8940024B24ACBD2800EBE74B /* PBXTargetDependency */,
 			);
+			fileSystemSynchronizedGroups = (
+				899AD0422E66100E00449710 /* DNSecureTests */,
+			);
 			name = DNSecureTests;
 			productName = DNSecureTests;
 			productReference = 8940024924ACBD2800EBE74B /* DNSecureTests.xctest */;
@@ -236,6 +164,9 @@
 			dependencies = (
 				8940025624ACBD2800EBE74B /* PBXTargetDependency */,
 			);
+			fileSystemSynchronizedGroups = (
+				899AD0472E66101100449710 /* DNSecureUITests */,
+			);
 			name = DNSecureUITests;
 			productName = DNSecureUITests;
 			productReference = 8940025424ACBD2800EBE74B /* DNSecureUITests.xctest */;
@@ -313,25 +244,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8986CDCF251D9B3400D947CD /* Resolver.swift in Sources */,
-				89CB922125209DD100B6983C /* HowToActivateView.swift in Sources */,
-				890B80D5251DC3A20046BAA0 /* DetailView.swift in Sources */,
-				893AA853258F99630060B022 /* NEOnDemandRuleInterfaceType+CaseIterable.swift in Sources */,
-				893AA871258F99AD0060B022 /* NEOnDemandRuleAction+Codable.swift in Sources */,
-				893AA85D258F997A0060B022 /* NEOnDemandRuleInterfaceType+Codable.swift in Sources */,
-				894F33652C46D2F00060F385 /* RestorationView.swift in Sources */,
-				8940023E24ACBD2700EBE74B /* ContentView.swift in Sources */,
-				894958AD2548405E009691D5 /* RuleView.swift in Sources */,
-				8998041828DCDEEF00C8B421 /* DoHSections.swift in Sources */,
-				89E8B71A29F80164002C2AEF /* LazyTextField.swift in Sources */,
-				890B80DF251DC6B50046BAA0 /* Presets.swift in Sources */,
-				893AA858258F996F0060B022 /* NEOnDemandRuleInterfaceType+CustomStringConvertible.swift in Sources */,
-				8940023C24ACBD2700EBE74B /* DNSecureApp.swift in Sources */,
-				8998041628DCDED800C8B421 /* DoTSections.swift in Sources */,
-				893AA862258F998C0060B022 /* NEOnDemandRuleInterfaceType+isSSIDUsed.swift in Sources */,
-				893AA867258F99990060B022 /* NEOnDemandRuleAction+CaseIterable.swift in Sources */,
-				893AA86C258F99A10060B022 /* NEOnDemandRuleAction+CustomStringConvertible.swift in Sources */,
-				8963FDFB251DF1BC00E3DFE7 /* Bundle+displayName.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};