diff --git a/NearbyShare/DataModel.swift b/NearbyShare/Connection/DataModel.swift
similarity index 100%
rename from NearbyShare/DataModel.swift
rename to NearbyShare/Connection/DataModel.swift
diff --git a/NearbyShare/InboundNearbyConnection.swift b/NearbyShare/Connection/InboundNearbyConnection.swift
similarity index 100%
rename from NearbyShare/InboundNearbyConnection.swift
rename to NearbyShare/Connection/InboundNearbyConnection.swift
diff --git a/NearbyShare/NearbyConnection.swift b/NearbyShare/Connection/NearbyConnection.swift
similarity index 100%
rename from NearbyShare/NearbyConnection.swift
rename to NearbyShare/Connection/NearbyConnection.swift
diff --git a/NearbyShare/NearbyConnectionManager.swift b/NearbyShare/Connection/NearbyConnectionManager.swift
similarity index 100%
rename from NearbyShare/NearbyConnectionManager.swift
rename to NearbyShare/Connection/NearbyConnectionManager.swift
diff --git a/NearbyShare/OutboundNearbyConnection.swift b/NearbyShare/Connection/OutboundNearbyConnection.swift
similarity index 100%
rename from NearbyShare/OutboundNearbyConnection.swift
rename to NearbyShare/Connection/OutboundNearbyConnection.swift
diff --git a/NearbyShare/ConnectionFailureTracker.swift b/NearbyShare/Util/ConnectionFailureTracker.swift
similarity index 100%
rename from NearbyShare/ConnectionFailureTracker.swift
rename to NearbyShare/Util/ConnectionFailureTracker.swift
diff --git a/NearbyShare/Helpers.swift b/NearbyShare/Util/Helpers.swift
similarity index 100%
rename from NearbyShare/Helpers.swift
rename to NearbyShare/Util/Helpers.swift
diff --git a/NearbyShare/Logger.swift b/NearbyShare/Util/Logger.swift
similarity index 100%
rename from NearbyShare/Logger.swift
rename to NearbyShare/Util/Logger.swift
diff --git a/NearbyShare/SaveFilesManager.swift b/NearbyShare/Util/SaveFilesManager.swift
similarity index 100%
rename from NearbyShare/SaveFilesManager.swift
rename to NearbyShare/Util/SaveFilesManager.swift
diff --git a/NearbyShare/SleepManager.swift b/NearbyShare/Util/SleepManager.swift
similarity index 100%
rename from NearbyShare/SleepManager.swift
rename to NearbyShare/Util/SleepManager.swift
diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj
index 38ac6d7..19ca9bf 100644
--- a/QuickDrop.xcodeproj/project.pbxproj
+++ b/QuickDrop.xcodeproj/project.pbxproj
@@ -253,11 +253,8 @@
 			isa = PBXGroup;
 			children = (
 				699DEBA52AB0573200115D22 /* ShareViewController.swift */,
-				EBCC27F82D80C9F70079C478 /* Zip.swift */,
-				EB96ED8A2D7F7CF4004B3FF1 /* SmallSheetView.swift */,
-				691F53B92ABB70840089FD92 /* DeviceListCell.swift */,
-				691F53BA2ABB70840089FD92 /* DeviceListCell.xib */,
-				699DEBA72AB0573200115D22 /* ShareViewController.xib */,
+				EB5C371F2E3669500052EFD7 /* Util */,
+				EB5C371E2E36693D0052EFD7 /* View */,
 				699DEBAA2AB0573200115D22 /* Info.plist */,
 				699DEBAB2AB0573200115D22 /* ShareExtension.entitlements */,
 			);
@@ -297,7 +294,6 @@
 				69DA9A1329E0BF5200A442DA /* Assets.xcassets */,
 				EB5C36922E34EBBD0052EFD7 /* Localizable.xcstrings */,
 				69DA9A1829E0BF5200A442DA /* QuickDrop.entitlements */,
-				69D2C32E29E7898C00EC7E30 /* MainMenu.xib */,
 			);
 			path = QuickDrop;
 			sourceTree = "<group>";
@@ -318,18 +314,10 @@
 		69DCF4822AB70D0600CBE2CC /* NearbyShare */ = {
 			isa = PBXGroup;
 			children = (
-				EB2B41E32DC63AC80070FC39 /* SleepManager.swift */,
-				EB7CD1442D6FB0C100CB0CB5 /* Logger.swift */,
+				EB5C371C2E3669010052EFD7 /* Util */,
 				EB3B73F92DC8FF3A00369951 /* ProtobufSource */,
 				69DA9A2729E18CB500A442DA /* Protobuf */,
-				69DA9A1E29E0C0B300A442DA /* NearbyConnectionManager.swift */,
-				69DA9A2229E17F0400A442DA /* InboundNearbyConnection.swift */,
-				EB5C36E82E3546100052EFD7 /* DataModel.swift */,
-				691F53BD2ABF03820089FD92 /* OutboundNearbyConnection.swift */,
-				EB5C36E62E3544FB0052EFD7 /* SaveFilesManager.swift */,
-				EB2F9BFA2DA04B67004010A2 /* Helpers.swift */,
-				698DFAE529E2F91A0064F247 /* NearbyConnection.swift */,
-				EB6E743D2DD5C76F00331466 /* ConnectionFailureTracker.swift */,
+				EB5C371D2E3669150052EFD7 /* Connection */,
 			);
 			path = NearbyShare;
 			sourceTree = "<group>";
@@ -347,9 +335,53 @@
 			path = ProtobufSource;
 			sourceTree = "<group>";
 		};
+		EB5C371C2E3669010052EFD7 /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				EB2B41E32DC63AC80070FC39 /* SleepManager.swift */,
+				EB7CD1442D6FB0C100CB0CB5 /* Logger.swift */,
+				EB5C36E62E3544FB0052EFD7 /* SaveFilesManager.swift */,
+				EB2F9BFA2DA04B67004010A2 /* Helpers.swift */,
+				EB6E743D2DD5C76F00331466 /* ConnectionFailureTracker.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
+		EB5C371D2E3669150052EFD7 /* Connection */ = {
+			isa = PBXGroup;
+			children = (
+				69DA9A1E29E0C0B300A442DA /* NearbyConnectionManager.swift */,
+				69DA9A2229E17F0400A442DA /* InboundNearbyConnection.swift */,
+				EB5C36E82E3546100052EFD7 /* DataModel.swift */,
+				691F53BD2ABF03820089FD92 /* OutboundNearbyConnection.swift */,
+				698DFAE529E2F91A0064F247 /* NearbyConnection.swift */,
+			);
+			path = Connection;
+			sourceTree = "<group>";
+		};
+		EB5C371E2E36693D0052EFD7 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				EB96ED8A2D7F7CF4004B3FF1 /* SmallSheetView.swift */,
+				691F53B92ABB70840089FD92 /* DeviceListCell.swift */,
+				691F53BA2ABB70840089FD92 /* DeviceListCell.xib */,
+				699DEBA72AB0573200115D22 /* ShareViewController.xib */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		EB5C371F2E3669500052EFD7 /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				EBCC27F82D80C9F70079C478 /* Zip.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
 		EBC05C6A2E33B55100EECC18 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				69D2C32E29E7898C00EC7E30 /* MainMenu.xib */,
 				EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */,
 				EB7F54112D78E95C00989564 /* TutorialView.swift */,
 				EB7F54132D78E9E400989564 /* LicenseWindow.swift */,
diff --git a/QuickDrop/MainMenu.xib b/QuickDrop/View/MainMenu.xib
similarity index 91%
rename from QuickDrop/MainMenu.xib
rename to QuickDrop/View/MainMenu.xib
index 51b38a6..bbc3a1f 100644
--- a/QuickDrop/MainMenu.xib
+++ b/QuickDrop/View/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
diff --git a/ShareExtension/Zip.swift b/ShareExtension/Util/Zip.swift
similarity index 100%
rename from ShareExtension/Zip.swift
rename to ShareExtension/Util/Zip.swift
diff --git a/ShareExtension/Base.lproj/ShareViewController.xib b/ShareExtension/View/Base.lproj/ShareViewController.xib
similarity index 100%
rename from ShareExtension/Base.lproj/ShareViewController.xib
rename to ShareExtension/View/Base.lproj/ShareViewController.xib
diff --git a/ShareExtension/DeviceListCell.swift b/ShareExtension/View/DeviceListCell.swift
similarity index 100%
rename from ShareExtension/DeviceListCell.swift
rename to ShareExtension/View/DeviceListCell.swift
diff --git a/ShareExtension/DeviceListCell.xib b/ShareExtension/View/DeviceListCell.xib
similarity index 100%
rename from ShareExtension/DeviceListCell.xib
rename to ShareExtension/View/DeviceListCell.xib
diff --git a/ShareExtension/SmallSheetView.swift b/ShareExtension/View/SmallSheetView.swift
similarity index 100%
rename from ShareExtension/SmallSheetView.swift
rename to ShareExtension/View/SmallSheetView.swift
diff --git a/ShareExtension/mul.lproj/ShareViewController.xcstrings b/ShareExtension/View/mul.lproj/ShareViewController.xcstrings
similarity index 100%
rename from ShareExtension/mul.lproj/ShareViewController.xcstrings
rename to ShareExtension/View/mul.lproj/ShareViewController.xcstrings