diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 59d8ad0..e87380b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -4,6 +4,8 @@
     <bytecodeTargetLevel target="1.7">
       <module name="OpenEUICC.app" target="11" />
       <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector" target="1.8" />
+      <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.main" target="1.8" />
+      <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d051337..d06202a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,11 +13,10 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/libs" />
-            <option value="$PROJECT_DIR$/libs/hidden-apis" />
+            <option value="$PROJECT_DIR$/libs/hidden-apis-stub" />
             <option value="$PROJECT_DIR$/libs/lpad-sm-dp-plus-connector" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index bf861c2..3476b70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    compileOnly project(":libs:hidden-apis")
+    compileOnly project(':libs:hidden-apis-stub')
     implementation project(":libs:lpad-sm-dp-plus-connector")
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
diff --git a/libs/hidden-apis/.gitignore b/libs/hidden-apis-stub/.gitignore
similarity index 100%
rename from libs/hidden-apis/.gitignore
rename to libs/hidden-apis-stub/.gitignore
diff --git a/libs/hidden-apis/build.gradle b/libs/hidden-apis-stub/build.gradle
similarity index 100%
rename from libs/hidden-apis/build.gradle
rename to libs/hidden-apis-stub/build.gradle
diff --git a/libs/hidden-apis/src/main/AndroidManifest.xml b/libs/hidden-apis-stub/src/main/AndroidManifest.xml
similarity index 100%
rename from libs/hidden-apis/src/main/AndroidManifest.xml
rename to libs/hidden-apis-stub/src/main/AndroidManifest.xml
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/DownloadSubscriptionResult.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/DownloadSubscriptionResult.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/DownloadSubscriptionResult.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/DownloadSubscriptionResult.java
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/EuiccProfileInfo.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/EuiccProfileInfo.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/EuiccProfileInfo.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/EuiccProfileInfo.java
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/EuiccService.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/EuiccService.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/EuiccService.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/EuiccService.java
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
diff --git a/libs/hidden-apis/src/main/java/android/service/euicc/GetEuiccProfileInfoListResult.java b/libs/hidden-apis-stub/src/main/java/android/service/euicc/GetEuiccProfileInfoListResult.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/service/euicc/GetEuiccProfileInfoListResult.java
rename to libs/hidden-apis-stub/src/main/java/android/service/euicc/GetEuiccProfileInfoListResult.java
diff --git a/libs/hidden-apis/src/main/java/android/telephony/UiccAccessRule.java b/libs/hidden-apis-stub/src/main/java/android/telephony/UiccAccessRule.java
similarity index 100%
rename from libs/hidden-apis/src/main/java/android/telephony/UiccAccessRule.java
rename to libs/hidden-apis-stub/src/main/java/android/telephony/UiccAccessRule.java
diff --git a/settings.gradle b/settings.gradle
index ce3d71f..661e47c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "OpenEUICC"
 include ':app', ':libs:lpad-sm-dp-plus-connector'
-include ':libs:hidden-apis'
+include ':libs:hidden-apis-stub'