diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..a821470
--- /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)/lineage_sanders.mk
diff --git a/lineage.dependencies b/lineage.dependencies
new file mode 100644
index 0000000..a5ee286
--- /dev/null
+++ b/lineage.dependencies
@@ -0,0 +1,14 @@
+[
+  {
+    "repository": "android_vendor_motorola_sanders",
+    "target_path": "vendor/motorola/sanders"
+  },
+  {
+    "repository": "android_kernel_motorola_sanders",
+    "target_path": "kernel/motorola/msm8953"
+  },
+  {
+    "repository": "android_packages_resources_devicesettings",
+    "target_path": "packages/resources/devicesettings"
+  }
+]
diff --git a/sacred.mk b/lineage_sanders.mk
similarity index 61%
rename from sacred.mk
rename to lineage_sanders.mk
index 134a1cb..316a3b6 100644
--- a/sacred.mk
+++ b/lineage_sanders.mk
@@ -14,20 +14,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # Inherit from those products. Most specific first.
-$(call inherit-product, device/motorola/sanders/full_sanders.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit some common SacredOS stuff.
-$(call inherit-product, vendor/sacred/common.mk)
+# Inherit from device
+$(call inherit-product, device/motorola/sanders/device.mk)
+
+# Inherit from Sanders-Vendor
+$(call inherit-product, vendor/motorola/sanders/sanders-vendor.mk)
+
+# Inherit some common Lineage stuff.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Boot animation
 TARGET_SCREEN_WIDTH := 1080
 TARGET_SCREEN_HEIGHT := 1920
+TARGET_BOOT_ANIMATION_RES := 1080
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := sanders
-PRODUCT_NAME := sacred_sanders
+PRODUCT_NAME := lineage_sanders
 PRODUCT_BRAND := motorola
 PRODUCT_MANUFACTURER := motorola
 
@@ -37,4 +44,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME="Moto G5S Plus" \
     PRIVATE_BUILD_DESC="sanders-user 8.1.0 OPS28.65-36 9fea release-keys"
 
-BUILD_FINGERPRINT := google/walleye/walleye:8.1.0/OPM1.171019.011/4448085:user/release-keys
+# FINGERPRINT
+BUILD_FINGERPRINT := google/walleye/walleye:9/PPP3.180510.008/4811556:user/release-keys 
+VENDOR_BUILD_FINGERPRINT := google/walleye/walleye:9/PPP3.180510.008/4811556:user/release-keys
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d02d7ad..f224702 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-add_lunch_combo sacred_sanders-userdebug
+add_lunch_combo lineage_sanders-userdebug