diff --git a/.gitignore b/.gitignore
index 547cf0ef..d7c570a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@
 .externalNativeBuild
 .env
 *.jks
-.kotlin/sessions
+.kotlin
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ff936216..2679bb75 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,9 +2,13 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="17">
+      <module name="StudioProjects.WearMMR.app" target="21" />
       <module name="StudioProjects.WearMMR.buildSrc" target="17" />
       <module name="StudioProjects.WearMMR.buildSrc.main" target="17" />
       <module name="StudioProjects.WearMMR.buildSrc.test" target="17" />
+      <module name="WearMMR.companion" target="21" />
+      <module name="WearMMR.data" target="21" />
+      <module name="WearMMR.domain" target="21" />
     </bytecodeTargetLevel>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bff15413..c091e149 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -31,4 +32,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 24ffedae..beae7418 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/StudioProjects.WearMMR.app.unitTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/WearMMR.iml" filepath="$PROJECT_DIR$/.idea/modules/WearMMR.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/WearMMR.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/WearMMR.app.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/buildSrc/WearMMR.buildSrc.iml" filepath="$PROJECT_DIR$/.idea/modules/buildSrc/WearMMR.buildSrc.iml" />
@@ -9,11 +13,8 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/buildSrc/WearMMR.buildSrc.test.iml" filepath="$PROJECT_DIR$/.idea/modules/buildSrc/WearMMR.buildSrc.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.iml" filepath="$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.main.iml" filepath="$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/companion/WearMMR.companion.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/data/WearMMR.data.iml" filepath="$PROJECT_DIR$/.idea/modules/data/WearMMR.data.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/data/WearMMR.data.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/data/WearMMR.data.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/data/WearMMR.data.main.iml" filepath="$PROJECT_DIR$/.idea/modules/data/WearMMR.data.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/data/WearMMR.data.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/data/WearMMR.data.unitTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/domain/WearMMR.domain.iml" filepath="$PROJECT_DIR$/.idea/modules/domain/WearMMR.domain.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/domain/WearMMR.domain.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/domain/WearMMR.domain.androidTest.iml" />
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..931b96c3
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file