diff --git a/Package.swift b/Package.swift
index 3eae62a..e42e9da 100644
--- a/Package.swift
+++ b/Package.swift
@@ -15,10 +15,8 @@ let package = Package(
     targets: [
         .target(
             name: "QueueITLib",
-            dependencies: []),
-        .testTarget(
-            name: "QueueITLibTests",
-            dependencies: ["QueueITLib"])
+            path: "QueueITLib",
+            publicHeadersPath: "include")
     ],
     swiftLanguageVersions: [
         .version("5")
diff --git a/QueueITLib.xcodeproj/project.pbxproj b/QueueITLib.xcodeproj/project.pbxproj
index 92c0731..1953b57 100644
--- a/QueueITLib.xcodeproj/project.pbxproj
+++ b/QueueITLib.xcodeproj/project.pbxproj
@@ -45,28 +45,28 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		1D0970CB1F5EA43800495466 /* QueuePassedInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QueuePassedInfo.h; sourceTree = "<group>"; };
+		1D0970CB1F5EA43800495466 /* QueuePassedInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = QueuePassedInfo.h; path = include/QueuePassedInfo.h; sourceTree = "<group>"; };
 		1D0970CC1F5EA46E00495466 /* QueuePassedInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueuePassedInfo.m; sourceTree = "<group>"; };
-		1D24131F2164D86400DFACE1 /* QueueITWKViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QueueITWKViewController.h; sourceTree = "<group>"; };
+		1D24131F2164D86400DFACE1 /* QueueITWKViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = QueueITWKViewController.h; path = include/QueueITWKViewController.h; sourceTree = "<group>"; };
 		1D2413202164D86400DFACE1 /* QueueITWKViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QueueITWKViewController.m; sourceTree = "<group>"; };
-		1DCB83FB1BCE5375009B489A /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
+		1DCB83FB1BCE5375009B489A /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Reachability.h; path = include/Reachability.h; sourceTree = "<group>"; };
 		1DCB83FC1BCE5375009B489A /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-		1DDF312C1C931DC00036E5EB /* QueueCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueCache.h; sourceTree = "<group>"; };
+		1DDF312C1C931DC00036E5EB /* QueueCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueCache.h; path = include/QueueCache.h; sourceTree = "<group>"; };
 		1DDF312D1C931DC00036E5EB /* QueueCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueCache.m; sourceTree = "<group>"; };
 		1DE12F841B57E2ED00DD3BBE /* libQueueITLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libQueueITLib.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DE12F8F1B57E2ED00DD3BBE /* QueueITLibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QueueITLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DE12F951B57E2EE00DD3BBE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		1DE12FA51B57F0C000DD3BBE /* QueueService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueService.h; sourceTree = "<group>"; };
+		1DE12FA51B57F0C000DD3BBE /* QueueService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueService.h; path = include/QueueService.h; sourceTree = "<group>"; };
 		1DE12FA61B57F0C000DD3BBE /* QueueService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueService.m; sourceTree = "<group>"; };
-		1DE12FA81B57F14D00DD3BBE /* QueueService_NSURLConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueService_NSURLConnection.h; sourceTree = "<group>"; };
+		1DE12FA81B57F14D00DD3BBE /* QueueService_NSURLConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueService_NSURLConnection.h; path = include/QueueService_NSURLConnection.h; sourceTree = "<group>"; };
 		1DE12FA91B57F14D00DD3BBE /* QueueService_NSURLConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueService_NSURLConnection.m; sourceTree = "<group>"; };
-		1DE12FAE1B57F23F00DD3BBE /* QueueService_NSURLConnectionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueService_NSURLConnectionRequest.h; sourceTree = "<group>"; };
+		1DE12FAE1B57F23F00DD3BBE /* QueueService_NSURLConnectionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueService_NSURLConnectionRequest.h; path = include/QueueService_NSURLConnectionRequest.h; sourceTree = "<group>"; };
 		1DE12FAF1B57F24000DD3BBE /* QueueService_NSURLConnectionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueService_NSURLConnectionRequest.m; sourceTree = "<group>"; };
-		1DE12FBA1B57F3A300DD3BBE /* QueueStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueStatus.h; sourceTree = "<group>"; };
+		1DE12FBA1B57F3A300DD3BBE /* QueueStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueStatus.h; path = include/QueueStatus.h; sourceTree = "<group>"; };
 		1DE12FBB1B57F3A300DD3BBE /* QueueStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueStatus.m; sourceTree = "<group>"; };
-		1DE12FBD1B57F3DD00DD3BBE /* IOSUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSUtils.h; sourceTree = "<group>"; };
+		1DE12FBD1B57F3DD00DD3BBE /* IOSUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSUtils.h; path = include/IOSUtils.h; sourceTree = "<group>"; };
 		1DE12FBE1B57F3DD00DD3BBE /* IOSUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IOSUtils.m; sourceTree = "<group>"; };
-		1DE12FC01B57F42500DD3BBE /* QueueITEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueueITEngine.h; sourceTree = "<group>"; };
+		1DE12FC01B57F42500DD3BBE /* QueueITEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QueueITEngine.h; path = include/QueueITEngine.h; sourceTree = "<group>"; };
 		1DE12FC11B57F42500DD3BBE /* QueueITEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueueITEngine.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -126,8 +126,7 @@
 				1DE12FC01B57F42500DD3BBE /* QueueITEngine.h */,
 				1DE12FC11B57F42500DD3BBE /* QueueITEngine.m */,
 			);
-			name = QueueITLib;
-			path = Sources/QueueITLib;
+			path = QueueITLib;
 			sourceTree = "<group>";
 		};
 		1DE12F931B57E2ED00DD3BBE /* QueueITLibTests */ = {
diff --git a/Sources/QueueITLib/IOSUtils.m b/QueueITLib/IOSUtils.m
similarity index 100%
rename from Sources/QueueITLib/IOSUtils.m
rename to QueueITLib/IOSUtils.m
diff --git a/Sources/QueueITLib/QueueCache.m b/QueueITLib/QueueCache.m
similarity index 100%
rename from Sources/QueueITLib/QueueCache.m
rename to QueueITLib/QueueCache.m
diff --git a/Sources/QueueITLib/QueueITEngine.m b/QueueITLib/QueueITEngine.m
similarity index 100%
rename from Sources/QueueITLib/QueueITEngine.m
rename to QueueITLib/QueueITEngine.m
diff --git a/Sources/QueueITLib/QueueITWKViewController.m b/QueueITLib/QueueITWKViewController.m
similarity index 100%
rename from Sources/QueueITLib/QueueITWKViewController.m
rename to QueueITLib/QueueITWKViewController.m
diff --git a/Sources/QueueITLib/QueuePassedInfo.m b/QueueITLib/QueuePassedInfo.m
similarity index 100%
rename from Sources/QueueITLib/QueuePassedInfo.m
rename to QueueITLib/QueuePassedInfo.m
diff --git a/Sources/QueueITLib/QueueService.m b/QueueITLib/QueueService.m
similarity index 100%
rename from Sources/QueueITLib/QueueService.m
rename to QueueITLib/QueueService.m
diff --git a/Sources/QueueITLib/QueueService_NSURLConnection.m b/QueueITLib/QueueService_NSURLConnection.m
similarity index 100%
rename from Sources/QueueITLib/QueueService_NSURLConnection.m
rename to QueueITLib/QueueService_NSURLConnection.m
diff --git a/Sources/QueueITLib/QueueService_NSURLConnectionRequest.m b/QueueITLib/QueueService_NSURLConnectionRequest.m
similarity index 100%
rename from Sources/QueueITLib/QueueService_NSURLConnectionRequest.m
rename to QueueITLib/QueueService_NSURLConnectionRequest.m
diff --git a/Sources/QueueITLib/QueueStatus.m b/QueueITLib/QueueStatus.m
similarity index 100%
rename from Sources/QueueITLib/QueueStatus.m
rename to QueueITLib/QueueStatus.m
diff --git a/Sources/QueueITLib/Reachability.m b/QueueITLib/Reachability.m
similarity index 100%
rename from Sources/QueueITLib/Reachability.m
rename to QueueITLib/Reachability.m
diff --git a/Sources/QueueITLib/IOSUtils.h b/QueueITLib/include/IOSUtils.h
similarity index 100%
rename from Sources/QueueITLib/IOSUtils.h
rename to QueueITLib/include/IOSUtils.h
diff --git a/Sources/QueueITLib/QueueCache.h b/QueueITLib/include/QueueCache.h
similarity index 100%
rename from Sources/QueueITLib/QueueCache.h
rename to QueueITLib/include/QueueCache.h
diff --git a/Sources/QueueITLib/QueueITEngine.h b/QueueITLib/include/QueueITEngine.h
similarity index 100%
rename from Sources/QueueITLib/QueueITEngine.h
rename to QueueITLib/include/QueueITEngine.h
diff --git a/Sources/QueueITLib/QueueITWKViewController.h b/QueueITLib/include/QueueITWKViewController.h
similarity index 100%
rename from Sources/QueueITLib/QueueITWKViewController.h
rename to QueueITLib/include/QueueITWKViewController.h
diff --git a/Sources/QueueITLib/QueuePassedInfo.h b/QueueITLib/include/QueuePassedInfo.h
similarity index 100%
rename from Sources/QueueITLib/QueuePassedInfo.h
rename to QueueITLib/include/QueuePassedInfo.h
diff --git a/Sources/QueueITLib/QueueService.h b/QueueITLib/include/QueueService.h
similarity index 100%
rename from Sources/QueueITLib/QueueService.h
rename to QueueITLib/include/QueueService.h
diff --git a/Sources/QueueITLib/QueueService_NSURLConnection.h b/QueueITLib/include/QueueService_NSURLConnection.h
similarity index 100%
rename from Sources/QueueITLib/QueueService_NSURLConnection.h
rename to QueueITLib/include/QueueService_NSURLConnection.h
diff --git a/Sources/QueueITLib/QueueService_NSURLConnectionRequest.h b/QueueITLib/include/QueueService_NSURLConnectionRequest.h
similarity index 100%
rename from Sources/QueueITLib/QueueService_NSURLConnectionRequest.h
rename to QueueITLib/include/QueueService_NSURLConnectionRequest.h
diff --git a/Sources/QueueITLib/QueueStatus.h b/QueueITLib/include/QueueStatus.h
similarity index 100%
rename from Sources/QueueITLib/QueueStatus.h
rename to QueueITLib/include/QueueStatus.h
diff --git a/Sources/QueueITLib/Reachability.h b/QueueITLib/include/Reachability.h
similarity index 100%
rename from Sources/QueueITLib/Reachability.h
rename to QueueITLib/include/Reachability.h