diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..461df10
--- /dev/null
+++ b/AndroidProducts.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2017-2018 The LineageOS 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.
+
+PRODUCT_MAKEFILES := \
+	$(LOCAL_DIR)/aosp_sanders.mk
diff --git a/sacred.mk b/aosp_sanders.mk
similarity index 64%
rename from sacred.mk
rename to aosp_sanders.mk
index cf22b4e..c0f0aae 100644
--- a/sacred.mk
+++ b/aosp_sanders.mk
@@ -15,26 +15,30 @@
 # limitations under the License.
 
 
-# Inherit from those products. Most specific first.
-$(call inherit-product, device/motorola/sanders/full_sanders.mk)
+# Inherit from those products.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_n_mr1.mk)
 
-# Inherit some common SacredOS stuff.
-$(call inherit-product, vendor/sacred/common.mk)
+$(call inherit-product, device/motorola/sanders/device.mk)
+$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
 
-# Boot animation
-TARGET_SCREEN_WIDTH := 1080
-TARGET_SCREEN_HEIGHT := 1920
+# Pixel Stuffs
+TARGET_GAPPS_ARCH := arm64
+TARGET_BOOT_ANIMATION_RES := 1080
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := sanders
-PRODUCT_NAME := sacred_sanders
+PRODUCT_NAME := aosp_sanders
 PRODUCT_BRAND := motorola
 PRODUCT_MANUFACTURER := motorola
 
+PRODUCT_GMS_CLIENTID_BASE := android-motorola
+
 PRODUCT_SYSTEM_PROPERTY_BLACKLIST := ro.product.model
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME="Moto G5S Plus" \
+    PRODUCT_NAME="Moto G (5S) Plus" \
     PRIVATE_BUILD_DESC="sanders-user 8.1.0 OPS28.65-36 9fea release-keys"
 
 BUILD_FINGERPRINT := motorola/sanders/sanders:8.1.0/OPS28.65-36/9fea:user/release-keys
diff --git a/device.mk b/device.mk
index 0bf3c6a..fdfad1d 100644
--- a/device.mk
+++ b/device.mk
@@ -433,4 +433,5 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
-PRODUCT_GMS_CLIENTID_BASE := android-motorola
+# for specific
+$(call inherit-product, vendor/motorola/sanders/sanders-vendor.mk)
diff --git a/full_sanders.mk b/full_sanders.mk
deleted file mode 100644
index c5d0852..0000000
--- a/full_sanders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2015 The CyanogenMod 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.
-#
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
-# Inherit from potter device
-$(call inherit-product, device/motorola/sanders/device.mk)
-
-# Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := sanders
-PRODUCT_NAME := full_sanders
-
-# for specific
-$(call inherit-product, vendor/motorola/sanders/sanders-vendor.mk)
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d02d7ad..9797de1 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-add_lunch_combo sacred_sanders-userdebug
+add_lunch_combo aosp_sanders-userdebug