diff --git a/.gitmodules b/.gitmodules
index 5df7f69a9c..27c300858e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,15 +10,15 @@
 [submodule "dexcom-share-client-swift"]
 	path = dexcom-share-client-swift
 	url = https://github.com/LoopKit/dexcom-share-client-swift.git
-[submodule "rileylink_ios"]
-	path = rileylink_ios
-	url = https://github.com/ps2/rileylink_ios.git
+[submodule "RileyLinkKit"]
+	path = RileyLinkKit
+	url = https://github.com/LoopKit/RileyLinkKit
 [submodule "MKRingProgressView"]
 	path = MKRingProgressView
 	url = https://github.com/LoopKit/MKRingProgressView.git
 [submodule "NightscoutService"]
 	path = NightscoutService
-	url = https://github.com/ps2/NightscoutService.git
+	url = https://github.com/LoopKit/NightscoutService.git
 [submodule "Minizip"]
 	path = Minizip
 	url = https://github.com/LoopKit/Minizip.git
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
index d6870b0833..661695ef75 100644
--- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata
+++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
@@ -32,9 +32,6 @@
    <FileRef
       location = "group:dexcom-share-client-swift/ShareClient.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:rileylink_ios/RileyLink.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:AmplitudeService/AmplitudeService.xcodeproj">
    </FileRef>
@@ -68,6 +65,9 @@
    <FileRef
       location = "group:OmniKit/OmniKit.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:RileyLinkKit/RileyLinkKit.xcodeproj">
+   </FileRef>
    <FileRef
       location = "group:MinimedKit/MinimedKit.xcodeproj">
    </FileRef>
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
index 087a77d067..5120a1a48b 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
+++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -398,6 +398,20 @@
                ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "431CE7761F98564200255374"
+               BuildableName = "RileyLinkBLEKitTests.xctest"
+               BlueprintName = "RileyLinkBLEKitTests"
+               ReferencedContainer = "container:RileyLinkKit/RileyLinkKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -425,16 +439,6 @@
                ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "431CE7761F98564200255374"
-               BuildableName = "RileyLinkBLEKitTests.xctest"
-               BlueprintName = "RileyLinkBLEKitTests"
-               ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
diff --git a/RileyLinkKit b/RileyLinkKit
new file mode 160000
index 0000000000..91d3091594
--- /dev/null
+++ b/RileyLinkKit
@@ -0,0 +1 @@
+Subproject commit 91d30915942c7556b7da58ab61b89a8494110308
diff --git a/rileylink_ios b/rileylink_ios
deleted file mode 160000
index 6b2d3c45c6..0000000000
--- a/rileylink_ios
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6b2d3c45c6dfaeb6ea2a9da5111e7a2a5e2dc38e