diff --git a/.gitignore b/.gitignore
index 50bd0e8..9d60aee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ buildServer.json
 /ImageViewer.xcodeproj/xcuserdata
 /ImageViewer.xcodeproj/project.xcworkspace/xcuserdata
 /ImageViewer/flatc
+/worktrees
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2f5831e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dependencies/flatbuffers"]
+	path = dependencies/flatbuffers
+	url = https://github.com/google/flatbuffers.git
diff --git a/ImageViewer.xcodeproj/project.pbxproj b/ImageViewer.xcodeproj/project.pbxproj
index 196665e..26bbb20 100644
--- a/ImageViewer.xcodeproj/project.pbxproj
+++ b/ImageViewer.xcodeproj/project.pbxproj
@@ -11,6 +11,8 @@
 		228A32B12F849062008A980A /* metadata_generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 228A32B02F849062008A980A /* metadata_generated.swift */; };
 		22B015A72F82A2DC0088F94F /* FlatBuffers in Frameworks */ = {isa = PBXBuildFile; productRef = 22B015A62F82A2DC0088F94F /* FlatBuffers */; };
 		22B015A92F82A2DC0088F94F /* FlexBuffers in Frameworks */ = {isa = PBXBuildFile; productRef = 22B015A82F82A2DC0088F94F /* FlexBuffers */; };
+		22EF4C5B2FFDC39600852A4F /* FlatBuffers in Frameworks */ = {isa = PBXBuildFile; productRef = 22EF4C5A2FFDC39600852A4F /* FlatBuffers */; };
+		22EF4C5D2FFDC39600852A4F /* FlexBuffers in Frameworks */ = {isa = PBXBuildFile; productRef = 22EF4C5C2FFDC39600852A4F /* FlexBuffers */; };
 		840F62692E7B65B700C8A64A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840F62682E7B65B700C8A64A /* AppDelegate.swift */; };
 		840F626D2E7B65B700C8A64A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840F626C2E7B65B700C8A64A /* ViewController.swift */; };
 		840F62722E7B65B900C8A64A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 840F62712E7B65B900C8A64A /* Assets.xcassets */; };
@@ -31,8 +33,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				22EF4C5B2FFDC39600852A4F /* FlatBuffers in Frameworks */,
 				22B015A72F82A2DC0088F94F /* FlatBuffers in Frameworks */,
 				22B015A92F82A2DC0088F94F /* FlexBuffers in Frameworks */,
+				22EF4C5D2FFDC39600852A4F /* FlexBuffers in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -113,7 +117,7 @@
 			);
 			mainGroup = 840F625C2E7B65B700C8A64A;
 			packageReferences = (
-				22B015A52F82A2DC0088F94F /* XCLocalSwiftPackageReference "../flatbuffers" */,
+				22EF4C592FFDC39600852A4F /* XCLocalSwiftPackageReference "dependencies/flatbuffers" */,
 			);
 			productRefGroup = 840F62662E7B65B700C8A64A /* Products */;
 			projectDirPath = "";
@@ -348,9 +352,9 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		22B015A52F82A2DC0088F94F /* XCLocalSwiftPackageReference "../flatbuffers" */ = {
+		22EF4C592FFDC39600852A4F /* XCLocalSwiftPackageReference "dependencies/flatbuffers" */ = {
 			isa = XCLocalSwiftPackageReference;
-			relativePath = ../flatbuffers;
+			relativePath = dependencies/flatbuffers;
 		};
 /* End XCLocalSwiftPackageReference section */
 
@@ -363,6 +367,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = FlexBuffers;
 		};
+		22EF4C5A2FFDC39600852A4F /* FlatBuffers */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlatBuffers;
+		};
+		22EF4C5C2FFDC39600852A4F /* FlexBuffers */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlexBuffers;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 840F625D2E7B65B700C8A64A /* Project object */;
diff --git a/dependencies/flatbuffers b/dependencies/flatbuffers
new file mode 160000
index 0000000..81edeb1
--- /dev/null
+++ b/dependencies/flatbuffers
@@ -0,0 +1 @@
+Subproject commit 81edeb17d9118143f2c81caf27edfb0df401279e