diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..ab3d1a7
--- /dev/null
+++ b/AndroidProducts.mk
@@ -0,0 +1,31 @@
+#
+# Copyright 2017 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.
+#
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/twrp_akari.mk \
+    $(LOCAL_DIR)/twrp_apollo.mk \
+    $(LOCAL_DIR)/twrp_aurora.mk \
+    $(LOCAL_DIR)/twrp_akatsuki.mk
+
+COMMON_LUNCH_CHOICES := \
+    twrp_akari-eng \
+    twrp_akari-userdebug \
+    twrp_apollo-eng \
+    twrp_apollo-userdebug \
+    twrp_aurora-eng \
+    twrp_aurora-userdebug \
+    twrp_akatsuki-eng \
+    twrp_akatsuki-userdebug
diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
new file mode 100644
index 0000000..8e8ead6
--- /dev/null
+++ b/sepolicy/recovery.te
@@ -0,0 +1,3 @@
+recovery_only(`
+  allow kernel block_device:blk_file read;
+')
diff --git a/twrp_akari.mk b/twrp_akari.mk
new file mode 100644
index 0000000..b22be57
--- /dev/null
+++ b/twrp_akari.mk
@@ -0,0 +1,54 @@
+#
+# Copyright 2017 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.
+#
+#
+# Only the below variable(s) need to be changed!
+#
+# Define hardware platform
+PRODUCT_PLATFORM := sdm845
+
+#
+#
+#
+# The below variables will be generated automatically
+#
+#
+# Release name (automatically taken from this file's suffix)
+PRODUCT_RELEASE_NAME := $(lastword $(subst /, ,$(lastword $(subst _, ,$(firstword $(subst ., ,$(MAKEFILE_LIST)))))))
+
+# Custom vendor used in build tree (automatically taken from this file's prefix)
+CUSTOM_VENDOR := $(lastword $(subst /, ,$(firstword $(subst _, ,$(firstword $(MAKEFILE_LIST))))))
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/$(CUSTOM_VENDOR)/config/common.mk)
+
+# OEM Info (automatically taken from device tree path)
+BOARD_VENDOR := $(or $(word 2,$(subst /, ,$(firstword $(MAKEFILE_LIST)))),$(value 2))
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := $(PRODUCT_RELEASE_NAME)
+PRODUCT_NAME := $(CUSTOM_VENDOR)_$(PRODUCT_DEVICE)
+PRODUCT_BRAND := $(BOARD_VENDOR)
+PRODUCT_MODEL := Xperia XZ2
+PRODUCT_MANUFACTURER := $(PRODUCT_BRAND)
+
+# Common path for device trees
+COMMON_PATH := device/$(PRODUCT_BRAND)/tama
+
+# Device path for OEM device tree
+DEVICE_PATH := device/$(PRODUCT_BRAND)/tama/$(PRODUCT_DEVICE)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, $(COMMON_PATH)/device.mk)
diff --git a/twrp_akatsuki.mk b/twrp_akatsuki.mk
new file mode 100644
index 0000000..4e37835
--- /dev/null
+++ b/twrp_akatsuki.mk
@@ -0,0 +1,54 @@
+#
+# Copyright 2017 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.
+#
+#
+# Only the below variable(s) need to be changed!
+#
+# Define hardware platform
+PRODUCT_PLATFORM := sdm845
+
+#
+#
+#
+# The below variables will be generated automatically
+#
+#
+# Release name (automatically taken from this file's suffix)
+PRODUCT_RELEASE_NAME := $(lastword $(subst /, ,$(lastword $(subst _, ,$(firstword $(subst ., ,$(MAKEFILE_LIST)))))))
+
+# Custom vendor used in build tree (automatically taken from this file's prefix)
+CUSTOM_VENDOR := $(lastword $(subst /, ,$(firstword $(subst _, ,$(firstword $(MAKEFILE_LIST))))))
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/$(CUSTOM_VENDOR)/config/common.mk)
+
+# OEM Info (automatically taken from device tree path)
+BOARD_VENDOR := $(or $(word 2,$(subst /, ,$(firstword $(MAKEFILE_LIST)))),$(value 2))
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := $(PRODUCT_RELEASE_NAME)
+PRODUCT_NAME := $(CUSTOM_VENDOR)_$(PRODUCT_DEVICE)
+PRODUCT_BRAND := $(BOARD_VENDOR)
+PRODUCT_MODEL := Xperia XZ3
+PRODUCT_MANUFACTURER := $(PRODUCT_BRAND)
+
+# Common path for device trees
+COMMON_PATH := device/$(PRODUCT_BRAND)/tama
+
+# Device path for OEM device tree
+DEVICE_PATH := device/$(PRODUCT_BRAND)/tama/$(PRODUCT_DEVICE)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, $(COMMON_PATH)/device.mk)
diff --git a/twrp_apollo.mk b/twrp_apollo.mk
new file mode 100644
index 0000000..15a088c
--- /dev/null
+++ b/twrp_apollo.mk
@@ -0,0 +1,54 @@
+#
+# Copyright 2017 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.
+#
+#
+# Only the below variable(s) need to be changed!
+#
+# Define hardware platform
+PRODUCT_PLATFORM := sdm845
+
+#
+#
+#
+# The below variables will be generated automatically
+#
+#
+# Release name (automatically taken from this file's suffix)
+PRODUCT_RELEASE_NAME := $(lastword $(subst /, ,$(lastword $(subst _, ,$(firstword $(subst ., ,$(MAKEFILE_LIST)))))))
+
+# Custom vendor used in build tree (automatically taken from this file's prefix)
+CUSTOM_VENDOR := $(lastword $(subst /, ,$(firstword $(subst _, ,$(firstword $(MAKEFILE_LIST))))))
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/$(CUSTOM_VENDOR)/config/common.mk)
+
+# OEM Info (automatically taken from device tree path)
+BOARD_VENDOR := $(or $(word 2,$(subst /, ,$(firstword $(MAKEFILE_LIST)))),$(value 2))
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := $(PRODUCT_RELEASE_NAME)
+PRODUCT_NAME := $(CUSTOM_VENDOR)_$(PRODUCT_DEVICE)
+PRODUCT_BRAND := $(BOARD_VENDOR)
+PRODUCT_MODEL := Xperia XZ2 Compact
+PRODUCT_MANUFACTURER := $(PRODUCT_BRAND)
+
+# Common path for device trees
+COMMON_PATH := device/$(PRODUCT_BRAND)/tama
+
+# Device path for OEM device tree
+DEVICE_PATH := device/$(PRODUCT_BRAND)/tama/$(PRODUCT_DEVICE)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, $(COMMON_PATH)/device.mk)
diff --git a/twrp_aurora.mk b/twrp_aurora.mk
new file mode 100644
index 0000000..b61ae0b
--- /dev/null
+++ b/twrp_aurora.mk
@@ -0,0 +1,54 @@
+#
+# Copyright 2017 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.
+#
+#
+# Only the below variable(s) need to be changed!
+#
+# Define hardware platform
+PRODUCT_PLATFORM := sdm845
+
+#
+#
+#
+# The below variables will be generated automatically
+#
+#
+# Release name (automatically taken from this file's suffix)
+PRODUCT_RELEASE_NAME := $(lastword $(subst /, ,$(lastword $(subst _, ,$(firstword $(subst ., ,$(MAKEFILE_LIST)))))))
+
+# Custom vendor used in build tree (automatically taken from this file's prefix)
+CUSTOM_VENDOR := $(lastword $(subst /, ,$(firstword $(subst _, ,$(firstword $(MAKEFILE_LIST))))))
+
+# Inherit from our custom product configuration
+$(call inherit-product, vendor/$(CUSTOM_VENDOR)/config/common.mk)
+
+# OEM Info (automatically taken from device tree path)
+BOARD_VENDOR := $(or $(word 2,$(subst /, ,$(firstword $(MAKEFILE_LIST)))),$(value 2))
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := $(PRODUCT_RELEASE_NAME)
+PRODUCT_NAME := $(CUSTOM_VENDOR)_$(PRODUCT_DEVICE)
+PRODUCT_BRAND := $(BOARD_VENDOR)
+PRODUCT_MODEL := Xperia XZ2 Premium
+PRODUCT_MANUFACTURER := $(PRODUCT_BRAND)
+
+# Common path for device trees
+COMMON_PATH := device/$(PRODUCT_BRAND)/tama
+
+# Device path for OEM device tree
+DEVICE_PATH := device/$(PRODUCT_BRAND)/tama/$(PRODUCT_DEVICE)
+
+# Inherit from hardware-specific part of the product configuration
+$(call inherit-product, $(COMMON_PATH)/device.mk)
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100644
index 0000000..4338777
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1 @@
+export ALLOW_MISSING_DEPENDENCIES=true