diff --git a/factory-images_bluejay/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
similarity index 100%
rename from factory-images_bluejay/generate-factory-images-package.sh
rename to factory-images/generate-factory-images-package.sh
diff --git a/self-extractors_bluejay/Android.mk b/self-extractors/Android.mk
similarity index 100%
rename from self-extractors_bluejay/Android.mk
rename to self-extractors/Android.mk
diff --git a/self-extractors_bluejay/METADATA b/self-extractors/METADATA
similarity index 100%
rename from self-extractors_bluejay/METADATA
rename to self-extractors/METADATA
diff --git a/self-extractors_bluejay/PART1 b/self-extractors/PART1
similarity index 100%
rename from self-extractors_bluejay/PART1
rename to self-extractors/PART1
diff --git a/self-extractors_bluejay/PART2 b/self-extractors/PART2
similarity index 100%
rename from self-extractors_bluejay/PART2
rename to self-extractors/PART2
diff --git a/self-extractors_bluejay/PART3 b/self-extractors/PART3
similarity index 100%
rename from self-extractors_bluejay/PART3
rename to self-extractors/PART3
diff --git a/self-extractors_bluejay/PROLOGUE b/self-extractors/PROLOGUE
similarity index 100%
rename from self-extractors_bluejay/PROLOGUE
rename to self-extractors/PROLOGUE
diff --git a/self-extractors_bluejay/extract-lists.txt b/self-extractors/extract-lists.txt
similarity index 100%
rename from self-extractors_bluejay/extract-lists.txt
rename to self-extractors/extract-lists.txt
diff --git a/self-extractors_bluejay/google_devices/COPYRIGHT b/self-extractors/google_devices/COPYRIGHT
similarity index 100%
rename from self-extractors_bluejay/google_devices/COPYRIGHT
rename to self-extractors/google_devices/COPYRIGHT
diff --git a/self-extractors_bluejay/google_devices/LICENSE b/self-extractors/google_devices/LICENSE
similarity index 100%
rename from self-extractors_bluejay/google_devices/LICENSE
rename to self-extractors/google_devices/LICENSE
diff --git a/self-extractors_bluejay/google_devices/staging/Android.bp.txt b/self-extractors/google_devices/staging/Android.bp.txt
similarity index 100%
rename from self-extractors_bluejay/google_devices/staging/Android.bp.txt
rename to self-extractors/google_devices/staging/Android.bp.txt
diff --git a/self-extractors_bluejay/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
similarity index 100%
rename from self-extractors_bluejay/google_devices/staging/Android.mk
rename to self-extractors/google_devices/staging/Android.mk
diff --git a/self-extractors_bluejay/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk
similarity index 100%
rename from self-extractors_bluejay/google_devices/staging/BoardConfigPartial.mk
rename to self-extractors/google_devices/staging/BoardConfigPartial.mk
diff --git a/self-extractors_bluejay/google_devices/staging/device-partial.mk b/self-extractors/google_devices/staging/device-partial.mk
similarity index 100%
rename from self-extractors_bluejay/google_devices/staging/device-partial.mk
rename to self-extractors/google_devices/staging/device-partial.mk
diff --git a/self-extractors_bluejay/root/android-info.txt b/self-extractors/root/android-info.txt
similarity index 100%
rename from self-extractors_bluejay/root/android-info.txt
rename to self-extractors/root/android-info.txt
diff --git a/self-extractors_bluejay/root/proprietary/BoardConfigVendor.mk b/self-extractors/root/proprietary/BoardConfigVendor.mk
similarity index 100%
rename from self-extractors_bluejay/root/proprietary/BoardConfigVendor.mk
rename to self-extractors/root/proprietary/BoardConfigVendor.mk
diff --git a/self-extractors_bluejay/root/proprietary/device-vendor.mk b/self-extractors/root/proprietary/device-vendor.mk
similarity index 100%
rename from self-extractors_bluejay/root/proprietary/device-vendor.mk
rename to self-extractors/root/proprietary/device-vendor.mk