diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..74b800c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "screen-state"]
+	path = screen-state
+	url = git@github.com:ouchadam/screen-state.git
diff --git a/build.gradle b/build.gradle
index e1c1e9b..944d6f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,12 +151,6 @@ ext.androidImportFixturesWorkaround = { project, fixtures ->
     project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}.jar")
 }
 
-ext.androidImportCompositeFixturesWorkaround = { project, fixtures ->
-    project.dependencies.testImplementation(project.dependencies.testFixtures(fixtures))
-    project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}-test-fixtures.jar")
-    project.dependencies.testImplementation fixtures.files("build/libs/${fixtures.name}.jar")
-}
-
 ext.isFoss = {
     return rootProject.hasProperty("foss")
 }
diff --git a/screen-state b/screen-state
new file mode 160000
index 0000000..4e92f14
--- /dev/null
+++ b/screen-state
@@ -0,0 +1 @@
+Subproject commit 4e92f14031cc8be907cba09b3bfc1d9dbd380072
diff --git a/settings.gradle b/settings.gradle
index f677ed5..d24e38e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
 }
 rootProject.name = "SmallTalk"
 
-includeBuild '../screen-state'
+includeBuild 'screen-state'
 
 include ':app'