diff --git a/Amplitude.xcodeproj/project.pbxproj b/Amplitude.xcodeproj/project.pbxproj
index d92a144a..b728fb0f 100644
--- a/Amplitude.xcodeproj/project.pbxproj
+++ b/Amplitude.xcodeproj/project.pbxproj
@@ -391,6 +391,7 @@
 		1279F8BF25244D78003DCE07 /* Amplitude */ = {
 			isa = PBXGroup;
 			children = (
+				19DD8B8C263B4B9B00CC7188 /* Public */,
 				759E93DA25FBF6F700BF7C3D /* AMPBackgroundNotifier.h */,
 				759E93DB25FBF6F700BF7C3D /* AMPBackgroundNotifier.m */,
 				1279F8E525244D78003DCE07 /* AMPConfigManager.h */,
@@ -401,15 +402,11 @@
 				1279F8D425244D78003DCE07 /* AMPDatabaseHelper.m */,
 				1279F8C225244D78003DCE07 /* AMPDeviceInfo.h */,
 				1279F8D525244D78003DCE07 /* AMPDeviceInfo.m */,
-				1279F8C125244D78003DCE07 /* AMPIdentify.h */,
 				1279F8D625244D78003DCE07 /* AMPIdentify.m */,
-				1279F8D325244D78003DCE07 /* Amplitude.h */,
 				1279F8EA25244D78003DCE07 /* Amplitude.m */,
 				1279F8D925244D78003DCE07 /* Amplitude+SSLPinning.h */,
 				1279F8D825244D78003DCE07 /* AmplitudePrivate.h */,
-				1279F8DA25244D78003DCE07 /* AMPRevenue.h */,
 				1279F8C725244D78003DCE07 /* AMPRevenue.m */,
-				1279F8E925244D78003DCE07 /* AMPTrackingOptions.h */,
 				1279F8D025244D78003DCE07 /* AMPTrackingOptions.m */,
 				1279F8C025244D78003DCE07 /* AMPURLConnection.h */,
 				1279F8D725244D78003DCE07 /* AMPURLConnection.m */,
@@ -473,6 +470,17 @@
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
+		19DD8B8C263B4B9B00CC7188 /* Public */ = {
+			isa = PBXGroup;
+			children = (
+				1279F8D325244D78003DCE07 /* Amplitude.h */,
+				1279F8C125244D78003DCE07 /* AMPIdentify.h */,
+				1279F8DA25244D78003DCE07 /* AMPRevenue.h */,
+				1279F8E925244D78003DCE07 /* AMPTrackingOptions.h */,
+			);
+			path = Public;
+			sourceTree = "<group>";
+		};
 		4FEE653130E7AE135280BC48 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/Package.swift b/Package.swift
index 74a40f6b..307145cb 100644
--- a/Package.swift
+++ b/Package.swift
@@ -18,6 +18,6 @@ let package = Package(
             name: "Amplitude",
             path: "Sources",
             resources: [.process("Resources/ComodoRsaDomainValidationCA.der")],
-            publicHeadersPath: "Amplitude"),
+            publicHeadersPath: "Amplitude/Public"),
     ]
 )
diff --git a/Sources/Amplitude/AMPIdentify.h b/Sources/Amplitude/Public/AMPIdentify.h
similarity index 100%
rename from Sources/Amplitude/AMPIdentify.h
rename to Sources/Amplitude/Public/AMPIdentify.h
diff --git a/Sources/Amplitude/AMPRevenue.h b/Sources/Amplitude/Public/AMPRevenue.h
similarity index 100%
rename from Sources/Amplitude/AMPRevenue.h
rename to Sources/Amplitude/Public/AMPRevenue.h
diff --git a/Sources/Amplitude/AMPTrackingOptions.h b/Sources/Amplitude/Public/AMPTrackingOptions.h
similarity index 100%
rename from Sources/Amplitude/AMPTrackingOptions.h
rename to Sources/Amplitude/Public/AMPTrackingOptions.h
diff --git a/Sources/Amplitude/Amplitude.h b/Sources/Amplitude/Public/Amplitude.h
similarity index 100%
rename from Sources/Amplitude/Amplitude.h
rename to Sources/Amplitude/Public/Amplitude.h