diff --git a/Euicc/Android.bp b/packages/Euicc/Android.bp
similarity index 100%
rename from Euicc/Android.bp
rename to packages/Euicc/Android.bp
diff --git a/Euicc/AndroidManifest.xml b/packages/Euicc/AndroidManifest.xml
similarity index 100%
rename from Euicc/AndroidManifest.xml
rename to packages/Euicc/AndroidManifest.xml
diff --git a/Euicc/res/raw/esim_intro_illustration_lottie.json b/packages/Euicc/res/raw/esim_intro_illustration_lottie.json
similarity index 100%
rename from Euicc/res/raw/esim_intro_illustration_lottie.json
rename to packages/Euicc/res/raw/esim_intro_illustration_lottie.json
diff --git a/Euicc/res/raw/sim_illustration_lottie_bottom.json b/packages/Euicc/res/raw/sim_illustration_lottie_bottom.json
similarity index 100%
rename from Euicc/res/raw/sim_illustration_lottie_bottom.json
rename to packages/Euicc/res/raw/sim_illustration_lottie_bottom.json
diff --git a/Euicc/res/values/strings.xml b/packages/Euicc/res/values/strings.xml
similarity index 100%
rename from Euicc/res/values/strings.xml
rename to packages/Euicc/res/values/strings.xml
diff --git a/IFAAService/Android.bp b/packages/IFAAService/Android.bp
similarity index 100%
rename from IFAAService/Android.bp
rename to packages/IFAAService/Android.bp
diff --git a/IFAAService/AndroidManifest.xml b/packages/IFAAService/AndroidManifest.xml
similarity index 100%
rename from IFAAService/AndroidManifest.xml
rename to packages/IFAAService/AndroidManifest.xml
diff --git a/IFAAService/res/values/strings.xml b/packages/IFAAService/res/values/strings.xml
similarity index 100%
rename from IFAAService/res/values/strings.xml
rename to packages/IFAAService/res/values/strings.xml
diff --git a/IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl b/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl
similarity index 100%
rename from IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl
rename to packages/IFAAService/src/org/ifaa/aidl/manager/IfaaManagerService.aidl
diff --git a/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt b/packages/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
similarity index 100%
rename from IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt
rename to packages/IFAAService/src/org/ifaa/aidl/manager/IfaaService.kt