diff --git a/boot.mk b/boot.mk
index ed8f7fe..cf07939 100644
--- a/boot.mk
+++ b/boot.mk
@@ -19,7 +19,7 @@
 
 $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr: $(HOST_OUT)/bin/mkimage
 	mkdir -p $(PRODUCT_OUT)/obj/BOOT_OBJ
-	$(HOST_OUT)/bin/mkimage -A arm -T script -O linux -d $(ROOTDIR)/build/boot.txt $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr
+	$(HOST_OUT)/bin/mkimage -A arm -T script -O linux -d $(ROOTDIR)/board/boot.txt $(PRODUCT_OUT)/obj/BOOT_OBJ/boot.scr
 
 targets::
 	@echo "boot - builds the kernel and boot partition"
diff --git a/boot.txt b/boot.txt
deleted file mode 100644
index 0e61229..0000000
--- a/boot.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-fdt_addr=0x43000000
-fdt_file=fsl-imx8mq-phanbell.dtb
-image=Image
-script=boot.scr
-mmc_root="PARTUUID=70672ec3-5eee-49ff-b3b1-eb1fbd406bf5"
-sd_root="/dev/mmcblk1p2"
-
-# Check boot device to decide which root partition to use
-if test ${bootdev} = 1; then
-    setenv root ${sd_root}
-else
-    setenv root ${mmc_root}
-fi
-
-cmdline="console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 root=${root} rootfstype=ext4 rw rootwait init=/sbin/init net.ifnames=0"
-
-ext2load mmc ${bootdev}:1 ${loadaddr} ${image}
-ext2load mmc ${bootdev}:1 ${fdt_addr} ${fdt_file}
-setenv bootargs ${cmdline}
-booti ${loadaddr} - ${fdt_addr}
diff --git a/defconfig b/defconfig
deleted file mode 100644
index d5fe12f..0000000
--- a/defconfig
+++ /dev/null
@@ -1,77 +0,0 @@
-CONFIG_IKCONFIG=y
-CONFIG_TYPEC_TCPM=n
-CONFIG_TYPEC_TCPCI=n
-CONFIG_ANDROID_PARANOID_NETWORK=n
-CONFIG_BRCMFMAC=n
-CONFIG_BRCMFMAC_SDIO=n
-CONFIG_BRCMUTIL=n
-CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=n
-CONFIG_KERNEL_GZIP=y
-CONFIG_KERNEL_LZO=n
-CONFIG_REGULATOR_BD71837=y
-CONFIG_MFD_BD71837=y
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_WLAN=y
-CONFIG_ATH10K=n
-
-# QCACLD-2.0
-CONFIG_CFG80211_INTERNAL_REGDB=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_PRIV=y
-CONFIG_WEXT_SPY=y
-CONFIG_QCA_CLD_WLAN=y
-# CONFIG_CLD_HL_SDIO_CORE is not set
-CONFIG_QCACLD_WLAN_LFR3=y
-CONFIG_PRIMA_WLAN_OKC=y
-CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
-CONFIG_WLAN_FEATURE_11W=y
-CONFIG_WLAN_FEATURE_LPSS=y
-CONFIG_QCOM_VOWIFI_11R=y
-CONFIG_WLAN_FEATURE_NAN=y
-CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
-CONFIG_QCOM_TDLS=y
-CONFIG_QCOM_LTE_COEX=y
-CONFIG_WLAN_OFFLOAD_PACKETS=y
-CONFIG_WLAN_FEATURE_MEMDUMP=y
-CONFIG_WLAN_SYNC_TSF=y
-# CONFIG_QCA_WIFI_AUTOMOTIVE_CONC is not set
-# CONFIG_WLAN_UDP_RESPONSE_OFFLOAD is not set
-# CONFIG_WLAN_WOW_PULSE is not set
-# CONFIG_DPTRACE_ENABLE is not set
-
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_SND_SOC_FSL_ASOC_CARD=y
-CONFIG_SND_SOC_RT5645=y
-CONFIG_SND_SOC_RT5631=y
-CONFIG_SND_SOC_RL6231=y
-CONFIG_MFD_BD71837=y
-CONFIG_REGULATOR_BD71837=y
-CONFIG_MXC_CAMERA_OV5645_MIPI_V2=y
-CONFIG_SPI_IMX=y
-# CONFIG_REGULATOR_ISL91301 is not set
-CONFIG_PCIEASPM_POWER_SUPERSAVE=y
-CONFIG_LOCALVERSION_AUTO=n
-CONFIG_IMX8MQ_PHANBELL_POWERSAVE=y
-CONFIG_DRM_PANEL_TIANMA_S6D6FP0A2=y
-CONFIG_STAGING_GASKET_FRAMEWORK=y
-CONFIG_STAGING_APEX_DRIVER=y
-CONFIG_REGULATOR_APEX_PMIC=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGETFS=y
-CONFIG_USB_FUNCTIONFS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONFIGFS_F_FS=y
-CONFIG_CONFIGFS_F_MTP=y
-CONFIG_CONFIGFS_F_PTP=y
-CONFIG_CONFIGFS_F_UEVENT=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_GADGETFS=y
-CONFIG_GOOGLE_APEX_POWER=y
diff --git a/flash.sh b/flash.sh
deleted file mode 100755
index c964522..0000000
--- a/flash.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-ROOTDIR=$(dirname $0)/..
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# If there's a boot.img in the same folder as flash.sh,
-# find artifacts in the directory containing the script.
-if [ -e ${SCRIPT_DIR}/boot.img ]; then
-    PRODUCT_OUT=${SCRIPT_DIR}
-else
-    PRODUCT_OUT=${PRODUCT_OUT:=${ROOTDIR}/out/target/product/imx8m_phanbell}
-fi
-
-
-fastboot flash bootloader0 ${PRODUCT_OUT}/u-boot.imx
-fastboot flash gpt ${PRODUCT_OUT}/partition-table.img
-fastboot reboot-bootloader
-fastboot erase misc
-fastboot flash boot ${PRODUCT_OUT}/boot.img
-fastboot flash rootfs ${PRODUCT_OUT}/rootfs.img
-fastboot reboot
diff --git a/fstab.emmc b/fstab.emmc
deleted file mode 100644
index 36592df..0000000
--- a/fstab.emmc
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/mmcblk0p3 / ext4 noatime,defaults 0 1
-/dev/mmcblk0p1 /boot ext2 noatime,defaults 0 2
-tmpfs /var/log tmpfs defaults 0 0
diff --git a/fstab.sdcard b/fstab.sdcard
deleted file mode 100644
index 99b420f..0000000
--- a/fstab.sdcard
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/mmcblk1p2 / ext4 noatime,defaults 0 1
-/dev/mmcblk1p1 /boot ext2 noatime,defaults 0 2
-tmpfs /var/log tmpfs defaults 0 0
diff --git a/kernel.mk b/kernel.mk
index a3f1a0c..d0a07bd 100644
--- a/kernel.mk
+++ b/kernel.mk
@@ -7,9 +7,9 @@
 $(KERNEL_OUT_DIR):
 	mkdir -p $(KERNEL_OUT_DIR)
 
-$(KERNEL_OUT_DIR)/.config: $(ROOTDIR)/build/defconfig | $(KERNEL_OUT_DIR)
+$(KERNEL_OUT_DIR)/.config: $(ROOTDIR)/board/defconfig | $(KERNEL_OUT_DIR)
 	+make -C $(KERNEL_SRC_DIR) O=$(KERNEL_OUT_DIR) $(KERNEL_OPTIONS) mrproper defconfig
-	cat $(ROOTDIR)/build/defconfig | tee -a $(KERNEL_OUT_DIR)/.config
+	cat $(ROOTDIR)/board/defconfig | tee -a $(KERNEL_OUT_DIR)/.config
 
 $(KERNEL_OUT_DIR)/arch/arm64/boot/Image: $(KERNEL_OUT_DIR)/.config
 		+make -C $(KERNEL_SRC_DIR) O=$(KERNEL_OUT_DIR) $(KERNEL_OPTIONS) Image modules dtbs
diff --git a/partition-table.json b/partition-table.json
deleted file mode 100644
index a39a449..0000000
--- a/partition-table.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "settings": {
-    "disk_size": "7 GiB",
-    "disk_alignment": "8 MiB",
-    "disk_guid": "85b83f23-51c4-4403-8bac-906ff5800f4e"
-  },
-  "partitions": [
-    {
-      "label": "boot",
-      "size": "128 MiB",
-      "guid": "595059e1-7b18-4e71-98f8-86b0ef75fe34",
-      "type_guid": "brillo_boot",
-      "position": 1
-    },
-    {
-      "label": "misc",
-      "size": "1 MiB",
-      "guid": "auto",
-      "type_guid": "brillo_misc",
-      "position": 2
-    },
-    {
-      "label": "rootfs",
-      "size": "2 GiB",
-      "grow": true,
-      "guid": "70672ec3-5eee-49ff-b3b1-eb1fbd406bf5",
-      "type_guid": "brillo_system",
-      "position": 3
-    }
-  ]
-}
diff --git a/partition-table.mk b/partition-table.mk
index 28f2623..13223f1 100644
--- a/partition-table.mk
+++ b/partition-table.mk
@@ -6,16 +6,16 @@
 
 partition-table: $(PRODUCT_OUT)/partition-table.img $(PRODUCT_OUT)/partition-table.json
 
-$(PRODUCT_OUT)/partition-table.json: $(ROOTDIR)/build/partition-table.json
+$(PRODUCT_OUT)/partition-table.json: $(ROOTDIR)/board/partition-table.json
 	mkdir -p $(PRODUCT_OUT)
 	$(ROOTDIR)/tools/bpt/bpttool make_table \
-		--input $(ROOTDIR)/build/partition-table.json \
+		--input $(ROOTDIR)/board/partition-table.json \
 		--output_json $(PRODUCT_OUT)/partition-table.json
 
-$(PRODUCT_OUT)/partition-table.img: $(ROOTDIR)/build/partition-table.json
+$(PRODUCT_OUT)/partition-table.img: $(ROOTDIR)/board/partition-table.json
 	mkdir -p $(PRODUCT_OUT)
 	$(ROOTDIR)/tools/bpt/bpttool make_table \
-		--input $(ROOTDIR)/build/partition-table.json \
+		--input $(ROOTDIR)/board/partition-table.json \
 		--output_gpt $(PRODUCT_OUT)/partition-table.img
 
 targets::
diff --git a/rootfs.mk b/rootfs.mk
index 452600b..3aee89a 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -82,6 +82,7 @@
 endif
 
 $(ROOTFS_PATCHED_IMG): $(ROOTFS_RAW_IMG) \
+                       $(ROOTDIR)/board/fstab.emmc \
                        $(ROOTDIR)/build/boot.mk \
                        $(PRODUCT_OUT)/linux-image-4.9.51-aiy_1_arm64.deb \
                        $(PRODUCT_OUT)/wayland-protocols-imx_1.13-0_all.deb \
@@ -100,7 +101,7 @@
 	+make -f $(ROOTDIR)/build/rootfs.mk firmware
 	+make -f $(ROOTDIR)/build/rootfs.mk adjustments
 
-	sudo cp $(ROOTDIR)/build/fstab.emmc $(ROOTFS_DIR)/etc/fstab
+	sudo cp $(ROOTDIR)/board/fstab.emmc $(ROOTFS_DIR)/etc/fstab
 
 	sudo mount -t tmpfs none $(ROOTFS_DIR)/tmp
 	sudo cp $(PRODUCT_OUT)/*.deb $(ROOTFS_DIR)/tmp/
diff --git a/sdcard.mk b/sdcard.mk
index 913c50f..9901dd4 100644
--- a/sdcard.mk
+++ b/sdcard.mk
@@ -14,6 +14,7 @@
                            $(ROOTDIR)/build/rootfs.mk \
                            $(ROOTDIR)/build/boot.mk \
                            $(ROOTDIR)/build/u-boot.mk \
+                           $(ROOTDIR)/board/fstab.sdcard \
                            | $(PRODUCT_OUT)/u-boot.imx \
                            $(PRODUCT_OUT)/boot.img \
                            $(PRODUCT_OUT)/obj/ROOTFS/rootfs.patched.img
@@ -36,7 +37,7 @@
 	sudo mount $(LOOP)p2 $(ROOTFS_DIR)
 	sudo mount $(LOOP)p1 $(ROOTFS_DIR)/boot
 
-	sudo cp $(ROOTDIR)/build/fstab.sdcard $(ROOTFS_DIR)/etc/fstab
+	sudo cp $(ROOTDIR)/board/fstab.sdcard $(ROOTFS_DIR)/etc/fstab
 
 	sudo umount $(ROOTFS_DIR)/boot
 	sudo umount $(ROOTFS_DIR)
diff --git a/setup.sh b/setup.sh
old mode 100644
new mode 100755
index 18c7790..11d065f
--- a/setup.sh
+++ b/setup.sh
@@ -34,7 +34,7 @@
 export HOST_OUT="${OUT}/host/linux-x86"
 export ROOT_OUT="${OUT}/root"
 
-export PATH="${PATH}:${HOST_OUT}/bin:${ROOTDIR}/build"
+export PATH="${PATH}:${HOST_OUT}/bin:${ROOTDIR}/build:${ROOTDIR}/board"
 
 function m
 {