diff --git a/QLAppBundle.xcodeproj/project.pbxproj b/QLAppBundle.xcodeproj/project.pbxproj
index 83f00be..8dbd07f 100644
--- a/QLAppBundle.xcodeproj/project.pbxproj
+++ b/QLAppBundle.xcodeproj/project.pbxproj
@@ -239,21 +239,20 @@
 		541051562E37AFC10083670B /* src */ = {
 			isa = PBXGroup;
 			children = (
-				5405CF5D2EA1199B00613856 /* MetaInfo.swift */,
+				543899122EDD0F38007C02FC /* Common */,
+				543899112EDD0EE2007C02FC /* Data - Android */,
+				543899102EDD0ED1007C02FC /* Data - Apple */,
+				5438990F2EDD0EA1007C02FC /* Preview */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
+		5438990F2EDD0EA1007C02FC /* Preview */ = {
+			isa = PBXGroup;
+			children = (
 				5412DECF2EBC283000F9040D /* RuntimeError.swift */,
-				54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */,
-				54993B892EDBA596008B656D /* Plist+Icon.swift */,
-				54993B872EDB9A9B008B656D /* Plist+Info.swift */,
-				54993B922EDBB419008B656D /* Plist+iTunesMetadata.swift */,
-				54993B942EDBC813008B656D /* Plist+MobileProvision.swift */,
-				54993B962EDC7C61008B656D /* Provisioning.swift */,
-				5469E11C2EA5930C00D46CE7 /* Entitlements.swift */,
-				54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */,
-				54CCF59D2EDC9A6800D766F9 /* AndroidSdkMap.swift */,
-				543899072EDCA223007C02FC /* Apk.swift */,
-				5438990A2EDCA27F007C02FC /* Apk+Icon.swift */,
-				540B77D82ED79BB2009E030C /* Apk+Manifest.swift */,
 				547F52DC2EB2C15D002B6D5F /* ExpirationStatus.swift */,
+				547F52F82EB2CBAB002B6D5F /* Date+Format.swift */,
 				547F52E62EB2C41C002B6D5F /* PreviewGenerator.swift */,
 				547F52EC2EB2C822002B6D5F /* Preview+AppInfo.swift */,
 				5412DECD2EBC168600F9040D /* Preview+ArchiveInfo.swift */,
@@ -263,12 +262,45 @@
 				547F52EE2EB2C8E8002B6D5F /* Preview+Provisioning.swift */,
 				547F52E92EB2C672002B6D5F /* Preview+FileInfo.swift */,
 				547F52F62EB2CAC7002B6D5F /* Preview+Footer.swift */,
-				5405CF642EA1376B00613856 /* Zip.swift */,
+			);
+			path = Preview;
+			sourceTree = "<group>";
+		};
+		543899102EDD0ED1007C02FC /* Data - Apple */ = {
+			isa = PBXGroup;
+			children = (
+				54D3A6EB2EA31B52001EF4F6 /* AppCategories.swift */,
+				54993B892EDBA596008B656D /* Plist+Icon.swift */,
+				54993B872EDB9A9B008B656D /* Plist+Info.swift */,
+				54993B922EDBB419008B656D /* Plist+iTunesMetadata.swift */,
+				54993B942EDBC813008B656D /* Plist+MobileProvision.swift */,
+				54993B962EDC7C61008B656D /* Provisioning.swift */,
+				5469E11C2EA5930C00D46CE7 /* Entitlements.swift */,
+			);
+			path = "Data - Apple";
+			sourceTree = "<group>";
+		};
+		543899112EDD0EE2007C02FC /* Data - Android */ = {
+			isa = PBXGroup;
+			children = (
+				54CCF59D2EDC9A6800D766F9 /* AndroidSdkMap.swift */,
+				543899072EDCA223007C02FC /* Apk.swift */,
+				5438990A2EDCA27F007C02FC /* Apk+Icon.swift */,
+				540B77D82ED79BB2009E030C /* Apk+Manifest.swift */,
+			);
+			path = "Data - Android";
+			sourceTree = "<group>";
+		};
+		543899122EDD0F38007C02FC /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				5405CF5D2EA1199B00613856 /* MetaInfo.swift */,
+				54D3A6ED2EA39CC6001EF4F6 /* AppIcon.swift */,
 				549E3BA02EBAE7D300ADFF56 /* URL+File.swift */,
 				54D3A6EF2EA3F49F001EF4F6 /* NSBezierPath+RoundedRect.swift */,
-				547F52F82EB2CBAB002B6D5F /* Date+Format.swift */,
+				5405CF642EA1376B00613856 /* Zip.swift */,
 			);
-			path = src;
+			path = Common;
 			sourceTree = "<group>";
 		};
 		54442BEB2E378B71008A870E = {
diff --git a/src/AppIcon.swift b/src/Common/AppIcon.swift
similarity index 100%
rename from src/AppIcon.swift
rename to src/Common/AppIcon.swift
diff --git a/src/MetaInfo.swift b/src/Common/MetaInfo.swift
similarity index 100%
rename from src/MetaInfo.swift
rename to src/Common/MetaInfo.swift
diff --git a/src/NSBezierPath+RoundedRect.swift b/src/Common/NSBezierPath+RoundedRect.swift
similarity index 100%
rename from src/NSBezierPath+RoundedRect.swift
rename to src/Common/NSBezierPath+RoundedRect.swift
diff --git a/src/URL+File.swift b/src/Common/URL+File.swift
similarity index 100%
rename from src/URL+File.swift
rename to src/Common/URL+File.swift
diff --git a/src/Zip.swift b/src/Common/Zip.swift
similarity index 100%
rename from src/Zip.swift
rename to src/Common/Zip.swift
diff --git a/src/AndroidSdkMap.swift b/src/Data - Android/AndroidSdkMap.swift
similarity index 100%
rename from src/AndroidSdkMap.swift
rename to src/Data - Android/AndroidSdkMap.swift
diff --git a/src/Apk+Icon.swift b/src/Data - Android/Apk+Icon.swift
similarity index 100%
rename from src/Apk+Icon.swift
rename to src/Data - Android/Apk+Icon.swift
diff --git a/src/Apk+Manifest.swift b/src/Data - Android/Apk+Manifest.swift
similarity index 100%
rename from src/Apk+Manifest.swift
rename to src/Data - Android/Apk+Manifest.swift
diff --git a/src/Apk.swift b/src/Data - Android/Apk.swift
similarity index 100%
rename from src/Apk.swift
rename to src/Data - Android/Apk.swift
diff --git a/src/AppCategories.swift b/src/Data - Apple/AppCategories.swift
similarity index 100%
rename from src/AppCategories.swift
rename to src/Data - Apple/AppCategories.swift
diff --git a/src/Entitlements.swift b/src/Data - Apple/Entitlements.swift
similarity index 100%
rename from src/Entitlements.swift
rename to src/Data - Apple/Entitlements.swift
diff --git a/src/Plist+Icon.swift b/src/Data - Apple/Plist+Icon.swift
similarity index 100%
rename from src/Plist+Icon.swift
rename to src/Data - Apple/Plist+Icon.swift
diff --git a/src/Plist+Info.swift b/src/Data - Apple/Plist+Info.swift
similarity index 100%
rename from src/Plist+Info.swift
rename to src/Data - Apple/Plist+Info.swift
diff --git a/src/Plist+MobileProvision.swift b/src/Data - Apple/Plist+MobileProvision.swift
similarity index 100%
rename from src/Plist+MobileProvision.swift
rename to src/Data - Apple/Plist+MobileProvision.swift
diff --git a/src/Plist+iTunesMetadata.swift b/src/Data - Apple/Plist+iTunesMetadata.swift
similarity index 100%
rename from src/Plist+iTunesMetadata.swift
rename to src/Data - Apple/Plist+iTunesMetadata.swift
diff --git a/src/Provisioning.swift b/src/Data - Apple/Provisioning.swift
similarity index 100%
rename from src/Provisioning.swift
rename to src/Data - Apple/Provisioning.swift
diff --git a/src/Date+Format.swift b/src/Preview/Date+Format.swift
similarity index 100%
rename from src/Date+Format.swift
rename to src/Preview/Date+Format.swift
diff --git a/src/ExpirationStatus.swift b/src/Preview/ExpirationStatus.swift
similarity index 100%
rename from src/ExpirationStatus.swift
rename to src/Preview/ExpirationStatus.swift
diff --git a/src/Preview+AppInfo.swift b/src/Preview/Preview+AppInfo.swift
similarity index 100%
rename from src/Preview+AppInfo.swift
rename to src/Preview/Preview+AppInfo.swift
diff --git a/src/Preview+ArchiveInfo.swift b/src/Preview/Preview+ArchiveInfo.swift
similarity index 100%
rename from src/Preview+ArchiveInfo.swift
rename to src/Preview/Preview+ArchiveInfo.swift
diff --git a/src/Preview+Entitlements.swift b/src/Preview/Preview+Entitlements.swift
similarity index 100%
rename from src/Preview+Entitlements.swift
rename to src/Preview/Preview+Entitlements.swift
diff --git a/src/Preview+FileInfo.swift b/src/Preview/Preview+FileInfo.swift
similarity index 100%
rename from src/Preview+FileInfo.swift
rename to src/Preview/Preview+FileInfo.swift
diff --git a/src/Preview+Footer.swift b/src/Preview/Preview+Footer.swift
similarity index 100%
rename from src/Preview+Footer.swift
rename to src/Preview/Preview+Footer.swift
diff --git a/src/Preview+Provisioning.swift b/src/Preview/Preview+Provisioning.swift
similarity index 100%
rename from src/Preview+Provisioning.swift
rename to src/Preview/Preview+Provisioning.swift
diff --git a/src/Preview+TransportSecurity.swift b/src/Preview/Preview+TransportSecurity.swift
similarity index 100%
rename from src/Preview+TransportSecurity.swift
rename to src/Preview/Preview+TransportSecurity.swift
diff --git a/src/Preview+iTunesPurchase.swift b/src/Preview/Preview+iTunesPurchase.swift
similarity index 100%
rename from src/Preview+iTunesPurchase.swift
rename to src/Preview/Preview+iTunesPurchase.swift
diff --git a/src/PreviewGenerator.swift b/src/Preview/PreviewGenerator.swift
similarity index 100%
rename from src/PreviewGenerator.swift
rename to src/Preview/PreviewGenerator.swift
diff --git a/src/RuntimeError.swift b/src/Preview/RuntimeError.swift
similarity index 100%
rename from src/RuntimeError.swift
rename to src/Preview/RuntimeError.swift