diff --git a/exynos4/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk
similarity index 100%
rename from exynos4/AdvancedDisplay/Android.mk
rename to AdvancedDisplay/Android.mk
diff --git a/exynos4/AdvancedDisplay/AndroidManifest.xml b/AdvancedDisplay/AndroidManifest.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/AndroidManifest.xml
rename to AdvancedDisplay/AndroidManifest.xml
diff --git a/exynos4/AdvancedDisplay/res/drawable/ic_settings_advanced_display.xml b/AdvancedDisplay/res/drawable/ic_settings_advanced_display.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/drawable/ic_settings_advanced_display.xml
rename to AdvancedDisplay/res/drawable/ic_settings_advanced_display.xml
diff --git a/exynos4/AdvancedDisplay/res/layout/framelayout.xml b/AdvancedDisplay/res/layout/framelayout.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/layout/framelayout.xml
rename to AdvancedDisplay/res/layout/framelayout.xml
diff --git a/exynos4/AdvancedDisplay/res/values/arrays.xml b/AdvancedDisplay/res/values/arrays.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/arrays.xml
rename to AdvancedDisplay/res/values/arrays.xml
diff --git a/exynos4/AdvancedDisplay/res/values/colors.xml b/AdvancedDisplay/res/values/colors.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/colors.xml
rename to AdvancedDisplay/res/values/colors.xml
diff --git a/exynos4/AdvancedDisplay/res/values/config.xml b/AdvancedDisplay/res/values/config.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/config.xml
rename to AdvancedDisplay/res/values/config.xml
diff --git a/exynos4/AdvancedDisplay/res/values/dimens.xml b/AdvancedDisplay/res/values/dimens.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/dimens.xml
rename to AdvancedDisplay/res/values/dimens.xml
diff --git a/exynos4/AdvancedDisplay/res/values/strings.xml b/AdvancedDisplay/res/values/strings.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/strings.xml
rename to AdvancedDisplay/res/values/strings.xml
diff --git a/exynos4/AdvancedDisplay/res/values/styles.xml b/AdvancedDisplay/res/values/styles.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/values/styles.xml
rename to AdvancedDisplay/res/values/styles.xml
diff --git a/exynos4/AdvancedDisplay/res/xml/screen_preferences.xml b/AdvancedDisplay/res/xml/screen_preferences.xml
similarity index 100%
rename from exynos4/AdvancedDisplay/res/xml/screen_preferences.xml
rename to AdvancedDisplay/res/xml/screen_preferences.xml
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java
diff --git a/exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java
similarity index 100%
rename from exynos4/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java
rename to AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java
diff --git a/Android.mk b/Android.mk
index 171f4921..14e25270 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,7 @@ include $(SAM_ROOT)/wifiloader/Android.mk
 endif
 
 ifeq ($(BOARD_VENDOR),samsung)
+include $(SAM_ROOT)/AdvancedDisplay/Android.mk
 include $(SAM_ROOT)/liblights/Android.mk
 include $(SAM_ROOT)/modemloader/Android.mk
 include $(SAM_ROOT)/power/Android.mk