diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2665f06..85e96f8 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,6 +15,6 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/utils/emulator/omni_emulator.mk
+    $(LOCAL_DIR)/utils/omni_emulator/omni_emulator.mk
 
 COMMON_LUNCH_CHOICES := omni_emulator-userdebug
diff --git a/utils/emulator/advancedFeatures.ini b/utils/emulator/advancedFeatures.ini
deleted file mode 100644
index 8554ebb..0000000
--- a/utils/emulator/advancedFeatures.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-GrallocSync = on
-LogcatPipe = on
-GLAsyncSwap = on
-GLESDynamicVersion = on
-GLDMA = on
-EncryptUserData = on
-IntelPerformanceMonitoringUnit = on
-Wifi = on
-HostComposition = on
-RefCountPipe = on
-#VirtioInput = on
-DynamicPartition = on
-MultiDisplay = on
-VulkanNullOptionalStrings = on
-YUV420888toNV21 = on
-YUVCache = on
diff --git a/utils/emulator/create_emulator_image.sh b/utils/emulator/create_emulator_image.sh
deleted file mode 100755
index ae0f23d..0000000
--- a/utils/emulator/create_emulator_image.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-if [ -z $ANDROID_BUILD_TOP ]; then
-    echo $ANDROID_BUILD_TOP undefined
-    exit 1
-fi
-
-if [ -z $ANDROID_PRODUCT_OUT ]; then
-    echo $ANDROID_PRODUCT_OUT undefined
-    exit 1
-fi
-
-if [ ! -f $ANDROID_PRODUCT_OUT/system.img ]; then
-    echo "Please build before running this"
-    exit 1
-fi
-
-
-# creates image zip in /tmp/
-cd $ANDROID_PRODUCT_OUT/..
-DIGEST=`grep "# " generic_x86/VerifiedBootParams.textproto| sed -e 's/# //'`
-
-cd $ANDROID_BUILD_TOP
-cp -r vendor/omni/utils/emulator/skins $ANDROID_PRODUCT_OUT
-cat vendor/omni/utils/emulator/start_emulator_image.sh | sed -e "s/vbmeta/$DIGEST/" > $ANDROID_PRODUCT_OUT/start_emulator_image.sh
-chmod 755 $ANDROID_PRODUCT_OUT/start_emulator_image.sh
-cp -r vendor/omni/utils/emulator/advancedFeatures.ini $ANDROID_PRODUCT_OUT
-
-cd $ANDROID_PRODUCT_OUT/..
-rm /tmp/omni_emulator.zip
-zip -r /tmp/omni_emulator.zip generic_x86/skins generic_x86/system-qemu.img generic_x86/system/build.prop generic_x86/cache.img generic_x86/userdata.img generic_x86/start_emulator_image.sh generic_x86/advancedFeatures.ini generic_x86/encryptionkey.img generic_x86/kernel-ranchu-64 generic_x86/ramdisk.img generic_x86/vendor-qemu.img
diff --git a/utils/emulator/fstab.ranchu b/utils/emulator/fstab.ranchu
deleted file mode 100644
index 0c83d59..0000000
--- a/utils/emulator/fstab.ranchu
+++ /dev/null
@@ -1,6 +0,0 @@
-# Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                              <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/vdc                                          /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check,quota,forceencrypt=/dev/block/vdd
-/devices/*/block/vdf                                    auto                auto      defaults                                             voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/utils/emulator/omni_emulator.mk b/utils/emulator/omni_emulator.mk
deleted file mode 100644
index 6f136f8..0000000
--- a/utils/emulator/omni_emulator.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-PRODUCT_COPY_FILES += \
-    vendor/omni/utils/emulator/fstab.ranchu:vendor/etc/fstab.ranchu \
-    vendor/omni/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml
-
-$(call inherit-product, build/target/product/sdk_x86.mk)
-
-$(call inherit-product, vendor/omni/config/gsm.mk)
-
-$(call inherit-product, vendor/omni/utils/emulator/common.mk)
-
-# Override product naming for Omni
-PRODUCT_NAME := omni_emulator
-
-DEVICE_PACKAGE_OVERLAYS += vendor/omni/utils/emulator/overlay
-
-ALLOW_MISSING_DEPENDENCIES := true 
diff --git a/utils/emulator/start_emulator_image.sh b/utils/emulator/start_emulator_image.sh
deleted file mode 100755
index ef8d04c..0000000
--- a/utils/emulator/start_emulator_image.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export ANDROID_BUILD_TOP=`pwd`
-export ANDROID_PRODUCT_OUT=`pwd`
-
-$HOME/Android/Sdk/emulator/emulator  -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_2_xl -gpu host -writable-system -qemu -cpu qemu64 -append "vbmeta"
diff --git a/utils/emulator/Android.mk b/utils/omni_emulator/Android.mk
similarity index 100%
rename from utils/emulator/Android.mk
rename to utils/omni_emulator/Android.mk
diff --git a/utils/omni_emulator/BoardConfig.mk b/utils/omni_emulator/BoardConfig.mk
new file mode 100644
index 0000000..f362f09
--- /dev/null
+++ b/utils/omni_emulator/BoardConfig.mk
@@ -0,0 +1,40 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# x86 emulator specific definitions
+TARGET_CPU_ABI := x86
+TARGET_ARCH := x86
+TARGET_ARCH_VARIANT := x86
+
+TARGET_PRELINK_MODULE := false
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+include vendor/omni/utils/omni_emulator/BoardConfigEmuCommon.mk
+
+# Resize to 4G to accomodate ASAN and CTS
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296
+
+BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/x86
+
+# Wifi.
+BOARD_WLAN_DEVICE           := emulator
+BOARD_HOSTAPD_DRIVER        := NL80211
+BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_simulated
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_simulated
+WPA_SUPPLICANT_VERSION      := VER_0_8_X
+WIFI_DRIVER_FW_PATH_PARAM   := "/dev/null"
+WIFI_DRIVER_FW_PATH_STA     := "/dev/null"
+WIFI_DRIVER_FW_PATH_AP      := "/dev/null"
diff --git a/utils/omni_emulator/BoardConfigEmuCommon.mk b/utils/omni_emulator/BoardConfigEmuCommon.mk
new file mode 100644
index 0000000..2067770
--- /dev/null
+++ b/utils/omni_emulator/BoardConfigEmuCommon.mk
@@ -0,0 +1,71 @@
+# BoardConfigEmuCommon.mk
+#
+# Common compile-time definitions for emulator
+#
+
+HAVE_HTC_AUDIO_DRIVER := true
+BOARD_USES_GENERIC_AUDIO := true
+TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)
+
+# No Kernel
+TARGET_NO_KERNEL := true
+
+# no hardware camera
+USE_CAMERA_STUB := true
+
+NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
+
+# Build OpenGLES emulation guest and host libraries
+BUILD_EMULATOR_OPENGL := true
+BUILD_QEMU_IMAGES := true
+
+# Build and enable the OpenGL ES View renderer. When running on the emulator,
+# the GLES renderer disables itself if host GL acceleration isn't available.
+USE_OPENGL_RENDERER := true
+
+# Emulator doesn't support sparse image format.
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+
+ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
+  # emulator is Non-A/B device
+  AB_OTA_UPDATER := false
+
+  # emulator needs super.img
+  BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
+
+  BOARD_EXT4_SHARE_DUP_BLOCKS := true
+
+  # 3G + header
+  BOARD_SUPER_PARTITION_SIZE := 3229614080
+  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
+  BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
+      system \
+      vendor
+
+  # 3G
+  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
+
+  # in build environment to speed up make -j
+  ifeq ($(QEMU_DISABLE_AVB),true)
+    BOARD_AVB_ENABLE := false
+  endif
+else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)
+  # Enable dynamic system image size and reserved 64MB in it.
+  BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
+  BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 67108864
+else
+  BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
+  BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640
+endif
+
+# Enable chain partition for system.
+BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml
+
+BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
diff --git a/utils/emulator/GoldfishParts/Android.mk b/utils/omni_emulator/GoldfishParts/Android.mk
similarity index 100%
rename from utils/emulator/GoldfishParts/Android.mk
rename to utils/omni_emulator/GoldfishParts/Android.mk
diff --git a/utils/emulator/GoldfishParts/AndroidManifest.xml b/utils/omni_emulator/GoldfishParts/AndroidManifest.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/AndroidManifest.xml
rename to utils/omni_emulator/GoldfishParts/AndroidManifest.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png b/utils/omni_emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png
rename to utils/omni_emulator/GoldfishParts/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/utils/emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png b/utils/omni_emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png
rename to utils/omni_emulator/GoldfishParts/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/utils/emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png b/utils/omni_emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png
rename to utils/omni_emulator/GoldfishParts/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/utils/emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png b/utils/omni_emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png
rename to utils/omni_emulator/GoldfishParts/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_camera.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_camera.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_camera.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_camera.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_disabled.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_disabled.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_disabled.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_disabled.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_flashlight.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_flashlight.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_flashlight.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_flashlight.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_next.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_music_next.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_music_next.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_music_next.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_play.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_music_play.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_music_play.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_music_play.xml
diff --git a/utils/emulator/GoldfishParts/res/drawable/ic_music_prev.xml b/utils/omni_emulator/GoldfishParts/res/drawable/ic_music_prev.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/drawable/ic_music_prev.xml
rename to utils/omni_emulator/GoldfishParts/res/drawable/ic_music_prev.xml
diff --git a/utils/emulator/GoldfishParts/res/layout/applist_preference.xml b/utils/omni_emulator/GoldfishParts/res/layout/applist_preference.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/layout/applist_preference.xml
rename to utils/omni_emulator/GoldfishParts/res/layout/applist_preference.xml
diff --git a/utils/emulator/GoldfishParts/res/layout/applist_preference_icon.xml b/utils/omni_emulator/GoldfishParts/res/layout/applist_preference_icon.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/layout/applist_preference_icon.xml
rename to utils/omni_emulator/GoldfishParts/res/layout/applist_preference_icon.xml
diff --git a/utils/emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml b/utils/omni_emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml
rename to utils/omni_emulator/GoldfishParts/res/layout/preference_dialog_vibrator_strength.xml
diff --git a/utils/emulator/GoldfishParts/res/values/arrays.xml b/utils/omni_emulator/GoldfishParts/res/values/arrays.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/values/arrays.xml
rename to utils/omni_emulator/GoldfishParts/res/values/arrays.xml
diff --git a/utils/emulator/GoldfishParts/res/values/config.xml b/utils/omni_emulator/GoldfishParts/res/values/config.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/values/config.xml
rename to utils/omni_emulator/GoldfishParts/res/values/config.xml
diff --git a/utils/emulator/GoldfishParts/res/values/strings.xml b/utils/omni_emulator/GoldfishParts/res/values/strings.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/values/strings.xml
rename to utils/omni_emulator/GoldfishParts/res/values/strings.xml
diff --git a/utils/emulator/GoldfishParts/res/xml/main.xml b/utils/omni_emulator/GoldfishParts/res/xml/main.xml
similarity index 100%
rename from utils/emulator/GoldfishParts/res/xml/main.xml
rename to utils/omni_emulator/GoldfishParts/res/xml/main.xml
diff --git a/utils/emulator/GoldfishParts/src/org/omnirom/device/DeviceSettings.java b/utils/omni_emulator/GoldfishParts/src/org/omnirom/device/DeviceSettings.java
similarity index 100%
rename from utils/emulator/GoldfishParts/src/org/omnirom/device/DeviceSettings.java
rename to utils/omni_emulator/GoldfishParts/src/org/omnirom/device/DeviceSettings.java
diff --git a/utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java b/utils/omni_emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
similarity index 100%
rename from utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
rename to utils/omni_emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
diff --git a/utils/emulator/README b/utils/omni_emulator/README
similarity index 100%
rename from utils/emulator/README
rename to utils/omni_emulator/README
diff --git a/utils/emulator/common.mk b/utils/omni_emulator/common.mk
similarity index 96%
rename from utils/emulator/common.mk
rename to utils/omni_emulator/common.mk
index b262b71..540e0be 100644
--- a/utils/emulator/common.mk
+++ b/utils/omni_emulator/common.mk
@@ -65,12 +65,10 @@
     vendor/omni/prebuilt/sounds/omni_unlock_phone.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ui/omni_unlock_phone.ogg
 
 # Additional packages
--include vendor/omni/utils/emulator/packages.mk
+-include vendor/omni/utils/omni_emulator/packages.mk
 
 # Versioning
 -include vendor/omni/config/version.mk
 
 # Add our overlays
-DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
-
-WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
\ No newline at end of file
diff --git a/utils/omni_emulator/create_emulator_image.sh b/utils/omni_emulator/create_emulator_image.sh
new file mode 100755
index 0000000..f563ad6
--- /dev/null
+++ b/utils/omni_emulator/create_emulator_image.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+if [ -z $ANDROID_BUILD_TOP ]; then
+    echo $ANDROID_BUILD_TOP undefined
+    exit 1
+fi
+
+if [ -z $ANDROID_PRODUCT_OUT ]; then
+    echo $ANDROID_PRODUCT_OUT undefined
+    exit 1
+fi
+
+if [ ! -f $ANDROID_PRODUCT_OUT/system.img ]; then
+    echo "Please build before running this"
+    exit 1
+fi
+
+# creates image zip in /tmp/
+cd $ANDROID_PRODUCT_OUT/..
+DIGEST=`grep "# " $TARGET_PRODUCT/VerifiedBootParams.textproto| sed -e 's/# //'`
+
+cd $ANDROID_BUILD_TOP
+cp -r vendor/omni/utils/$TARGET_PRODUCT/skins $ANDROID_PRODUCT_OUT
+cat vendor/omni/utils/$TARGET_PRODUCT/start_emulator_image.sh | sed -e "s/vbmeta/$DIGEST/" > $ANDROID_PRODUCT_OUT/start_emulator_image.sh
+chmod 755 $ANDROID_PRODUCT_OUT/start_emulator_image.sh
+cp device/generic/goldfish/data/etc/advancedFeatures.ini $ANDROID_PRODUCT_OUT
+
+cd $ANDROID_PRODUCT_OUT/..
+rm /tmp/omni_emulator.zip
+zip -r /tmp/omni_emulator.zip $TARGET_PRODUCT/skins $TARGET_PRODUCT/system-qemu.img $TARGET_PRODUCT/system/build.prop $TARGET_PRODUCT/cache.img $TARGET_PRODUCT/userdata.img $TARGET_PRODUCT/start_emulator_image.sh $TARGET_PRODUCT/advancedFeatures.ini $TARGET_PRODUCT/encryptionkey.img $TARGET_PRODUCT/kernel-ranchu-64 $TARGET_PRODUCT/ramdisk.img $TARGET_PRODUCT/vendor-qemu.img
diff --git a/utils/omni_emulator/fstab.ranchu b/utils/omni_emulator/fstab.ranchu
new file mode 100644
index 0000000..4a5f002
--- /dev/null
+++ b/utils/omni_emulator/fstab.ranchu
@@ -0,0 +1,6 @@
+# Android fstab file.
+#<dev>  <mnt_point> <type>  <mnt_flags options> <fs_mgr_flags>
+system   /system     ext4    ro,barrier=1     wait,logical,avb=vbmeta,first_stage_mount
+vendor   /vendor     ext4    ro,barrier=1     wait,logical,first_stage_mount
+/dev/block/vdc   /data     ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M
+/devices/*/block/vdf auto   auto      defaults    voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/utils/omni_emulator/fstab.ranchu.initrd b/utils/omni_emulator/fstab.ranchu.initrd
new file mode 100644
index 0000000..e792feb
--- /dev/null
+++ b/utils/omni_emulator/fstab.ranchu.initrd
@@ -0,0 +1,4 @@
+# Android fstab file for ramdisk
+#<dev>  <mnt_point> <type>  <mnt_flags options> <fs_mgr_flags>
+system   /system     ext4    ro,barrier=1     wait,logical,avb=vbmeta,first_stage_mount
+vendor   /vendor     ext4    ro,barrier=1     wait,logical,first_stage_mount
diff --git a/utils/emulator/omni.dependencies b/utils/omni_emulator/omni.dependencies
similarity index 100%
rename from utils/emulator/omni.dependencies
rename to utils/omni_emulator/omni.dependencies
diff --git a/utils/omni_emulator/omni_emulator.mk b/utils/omni_emulator/omni_emulator.mk
new file mode 100644
index 0000000..a832b51
--- /dev/null
+++ b/utils/omni_emulator/omni_emulator.mk
@@ -0,0 +1,24 @@
+PRODUCT_COPY_FILES += \
+    vendor/omni/utils/omni_emulator/fstab.ranchu.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
+    vendor/omni/utils/omni_emulator/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
+    vendor/omni/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
+TARGET_NO_VENDOR_BOOT := true
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_x86.mk)
+
+$(call inherit-product, vendor/omni/config/gsm.mk)
+
+$(call inherit-product, vendor/omni/utils/omni_emulator/common.mk)
+
+QEMU_USE_SYSTEM_EXT_PARTITIONS := false
+
+# Override product naming for Omni
+PRODUCT_NAME := omni_emulator
+PRODUCT_MANUFACTURER := OmniROM
+PRODUCT_DEVICE := omni_emulator
+
+DEVICE_PACKAGE_OVERLAYS += vendor/omni/utils/omni_emulator/overlay
+
+ALLOW_MISSING_DEPENDENCIES := true 
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 89%
rename from utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
rename to utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
index 7076cac..f77a3aa 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/omni_emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -23,12 +23,12 @@
     <bool name="config_dozeAlwaysOnEnabled">false</bool>
     <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
     <!--<string name="config_mainBuiltInDisplayCutout">M 0,0 L -183, 0 A 24.0, 24.0, 0, 0, 1, -159.0, 22.0 A 64.0, 64.0, 0, 0, 0, -95.0, 80.0 L 95.0, 80.0 A 64.0, 64.0, 0, 0, 0, 159.0, 22.0 A 24.0, 24.0, 0, 0, 1, 183.0, 0 Z</string>-->
-    <string name="config_mainBuiltInDisplayCutout">M -683,0 L -416,0 L -416,116 L -683,116 Z</string>
+    <!--<string name="config_mainBuiltInDisplayCutout">M -683,0 L -416,0 L -416,116 L -683,116 Z</string>-->
     
     <!-- Whether the display cutout region of the main built-in display should be forced to
     black in software (to avoid aliasing or emulate a cutout that is not physically existent).
     -->
-    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
+    <!--<bool name="config_fillMainBuiltInDisplayCutout">true</bool>-->
     <bool name="config_intrusiveNotificationLed">false</bool>
     <bool name="config_intrusiveBatteryLed">false</bool>
 
diff --git a/utils/emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml b/utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
similarity index 100%
rename from utils/emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
rename to utils/omni_emulator/overlay/frameworks/base/packages/SystemUI/res/values-sw372dp/dimens.xml
diff --git a/utils/emulator/packages.mk b/utils/omni_emulator/packages.mk
similarity index 65%
rename from utils/emulator/packages.mk
rename to utils/omni_emulator/packages.mk
index cac501e..efa1378 100644
--- a/utils/emulator/packages.mk
+++ b/utils/omni_emulator/packages.mk
@@ -3,46 +3,41 @@
     MonthCalendarWidget \
     OmniSwitch \
     OmniJaws \
-    OmniStyle \
-    MusicFX \
-    Phonograph \
     MatLog \
     OmniChange \
-    GoldfishParts \
-    OpenDelta \
-    Turbo \
-    OmniRecord \
-    ThemePicker \
-    webview \
-    ExactCalculator
+    OmniStyle \
+    SystemWebView \
+    Terminal
 
+ifneq ($(PRODUCT_EXCLUDE_EXTRA_PACKAGES),true)
 PRODUCT_PACKAGES += \
-     OmniOverlayStub \
-     omni-overlays
+    ChromeModernPublic \
+    ExactCalculator \
+    MusicFX \
+    Phonograph
+else
+PRODUCT_PACKAGES += \
+    OmniStoreInstaller
+endif
+
+#PRODUCT_PACKAGES += \
+    GoldfishParts \
+    OmniOverlayStub \
+    omni-overlays \
+    OpenDelta \
+    ThemePicker \
 
 # Additional tools
 PRODUCT_PACKAGES += \
     bash \
-    e2fsck \
-    fsck.exfat \
     htop \
-    lsof \
-    mke2fs \
-    mount.exfat \
-    nano \
-    openvpn \
-    powertop \
-    tune2fs \
-    vim \
-    mkfs.ntfs \
-    mount.ntfs \
-    fsck.ntfs
+    vim
 
 # Telephony extension
-PRODUCT_PACKAGES += telephony-ext
-PRODUCT_BOOT_JARS += telephony-ext
+#PRODUCT_PACKAGES += telephony-ext
+#PRODUCT_BOOT_JARS += telephony-ext
 
-PRODUCT_PACKAGES += \
+#PRODUCT_PACKAGES += \
     ims-ext-common \
     ims_ext_common.xml \
     qti-telephony-hidl-wrapper \
diff --git a/utils/emulator/skins/pixel_2_xl/hardware.ini b/utils/omni_emulator/skins/pixel_2_xl/hardware.ini
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/hardware.ini
rename to utils/omni_emulator/skins/pixel_2_xl/hardware.ini
diff --git a/utils/emulator/skins/pixel_2_xl/land_back.webp b/utils/omni_emulator/skins/pixel_2_xl/land_back.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/land_back.webp
rename to utils/omni_emulator/skins/pixel_2_xl/land_back.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_2_xl/land_fore.webp b/utils/omni_emulator/skins/pixel_2_xl/land_fore.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/land_fore.webp
rename to utils/omni_emulator/skins/pixel_2_xl/land_fore.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_2_xl/land_shadow.webp b/utils/omni_emulator/skins/pixel_2_xl/land_shadow.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/land_shadow.webp
rename to utils/omni_emulator/skins/pixel_2_xl/land_shadow.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_2_xl/layout b/utils/omni_emulator/skins/pixel_2_xl/layout
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/layout
rename to utils/omni_emulator/skins/pixel_2_xl/layout
diff --git a/utils/emulator/skins/pixel_2_xl/port_back.webp b/utils/omni_emulator/skins/pixel_2_xl/port_back.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/port_back.webp
rename to utils/omni_emulator/skins/pixel_2_xl/port_back.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_2_xl/port_fore.webp b/utils/omni_emulator/skins/pixel_2_xl/port_fore.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/port_fore.webp
rename to utils/omni_emulator/skins/pixel_2_xl/port_fore.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_2_xl/port_shadow.webp b/utils/omni_emulator/skins/pixel_2_xl/port_shadow.webp
similarity index 100%
rename from utils/emulator/skins/pixel_2_xl/port_shadow.webp
rename to utils/omni_emulator/skins/pixel_2_xl/port_shadow.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/hardware.ini b/utils/omni_emulator/skins/pixel_xl/hardware.ini
similarity index 100%
rename from utils/emulator/skins/pixel_xl/hardware.ini
rename to utils/omni_emulator/skins/pixel_xl/hardware.ini
diff --git a/utils/emulator/skins/pixel_xl/land_back.webp b/utils/omni_emulator/skins/pixel_xl/land_back.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/land_back.webp
rename to utils/omni_emulator/skins/pixel_xl/land_back.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/land_fore.webp b/utils/omni_emulator/skins/pixel_xl/land_fore.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/land_fore.webp
rename to utils/omni_emulator/skins/pixel_xl/land_fore.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/land_shadow.webp b/utils/omni_emulator/skins/pixel_xl/land_shadow.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/land_shadow.webp
rename to utils/omni_emulator/skins/pixel_xl/land_shadow.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/layout b/utils/omni_emulator/skins/pixel_xl/layout
similarity index 100%
rename from utils/emulator/skins/pixel_xl/layout
rename to utils/omni_emulator/skins/pixel_xl/layout
diff --git a/utils/emulator/skins/pixel_xl/port_back.webp b/utils/omni_emulator/skins/pixel_xl/port_back.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/port_back.webp
rename to utils/omni_emulator/skins/pixel_xl/port_back.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/port_fore.webp b/utils/omni_emulator/skins/pixel_xl/port_fore.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/port_fore.webp
rename to utils/omni_emulator/skins/pixel_xl/port_fore.webp
Binary files differ
diff --git a/utils/emulator/skins/pixel_xl/port_shadow.webp b/utils/omni_emulator/skins/pixel_xl/port_shadow.webp
similarity index 100%
rename from utils/emulator/skins/pixel_xl/port_shadow.webp
rename to utils/omni_emulator/skins/pixel_xl/port_shadow.webp
Binary files differ
diff --git a/utils/omni_emulator/start_emulator_image.sh b/utils/omni_emulator/start_emulator_image.sh
new file mode 100755
index 0000000..fc63b0c
--- /dev/null
+++ b/utils/omni_emulator/start_emulator_image.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+export ANDROID_BUILD_TOP=`pwd`
+export ANDROID_PRODUCT_OUT=`pwd`
+
+# -show-kernel
+
+$HOME/Android/Sdk/emulator/emulator -show-kernel -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_2_xl -gpu host -writable-system -qemu -cpu qemu64 -append "vbmeta"