diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6aa568
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+outdir/
+.*.swp
+target.sh
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..525e91e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+BOARD ?= qemu_x86
+CONF_FILE = boot/zephyr/prj.conf
+SOURCE_DIR = boot/zephyr
+
+# Needed for mbedtls config-boot.h file.
+CFLAGS += -I$(CURDIR)/boot/zephyr/include
+
+include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/boot/zephyr/Makefile b/boot/zephyr/Makefile
new file mode 100644
index 0000000..6b8618a
--- /dev/null
+++ b/boot/zephyr/Makefile
@@ -0,0 +1,8 @@
+subdir-ccflags-y += -I$(PROJECT)/boot/bootutil/include
+subdir-ccflags-y += -I$(PROJECT)/boot/zephyr/include
+
+obj-y += main.o
+obj-y += flash_map.o hal_flash.o os.o
+obj-y += keys.o
+
+obj-y += ../bootutil/src/
diff --git a/zephyr/src/flash_map.c b/boot/zephyr/flash_map.c
similarity index 100%
rename from zephyr/src/flash_map.c
rename to boot/zephyr/flash_map.c
diff --git a/zephyr/src/hal_flash.c b/boot/zephyr/hal_flash.c
similarity index 100%
rename from zephyr/src/hal_flash.c
rename to boot/zephyr/hal_flash.c
diff --git a/boot/zephyr/include/config-boot.h b/boot/zephyr/include/config-boot.h
new file mode 100644
index 0000000..8639932
--- /dev/null
+++ b/boot/zephyr/include/config-boot.h
@@ -0,0 +1,97 @@
+/*
+ *  Minimal configuration for using TLS in the bootloader
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  Copyright (C) 2016, Linaro Ltd
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/*
+ * Minimal configuration for using TLS in the bootloader
+ *
+ * - RSA or ECDSA signature verification
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+/* TODO: Configure this between app and target.  Really, we want the
+ * config to come from the app. */
+#define CONFIG_BOOT_VERIFY_RSA_SIGNATURE
+
+/* System support */
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_PLATFORM_EXIT_ALT
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+#define MBEDTLS_PLATFORM_PRINTF_ALT
+
+#if !defined(CONFIG_ARM)
+#define MBEDTLS_HAVE_ASM
+#endif
+
+#if defined(CONFIG_MBEDTLS_TEST)
+#define MBEDTLS_SELF_TEST
+#define MBEDTLS_DEBUG_C
+#else
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_TEST_NULL_ENTROPY
+#endif
+
+/* mbed TLS feature support */
+#ifdef CONFIG_BOOT_VERIFY_ECDSA_SIGNATURE
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_ECDSA_C
+#define MBEDTLS_ECDH_C
+#define MBEDTLS_ECP_C
+#endif
+
+#ifdef CONFIG_BOOT_VERIFY_RSA_SIGNATURE
+#define MBEDTLS_RSA_C
+#define MBEDTLS_PKCS1_V15
+#endif
+
+/* mbed TLS modules */
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_SHA256_C
+
+/* Save RAM by adjusting to our exact needs */
+#ifdef CONFIG_BOOT_VERIFY_RSA_SIGNATURE
+#define MBEDTLS_ECP_MAX_BITS             2048
+#define MBEDTLS_MPI_MAX_SIZE              256
+#else
+#define MBEDTLS_ECP_MAX_BITS             256
+#define MBEDTLS_MPI_MAX_SIZE              32 // 256 bits is 32 bytes
+#endif
+
+#define MBEDTLS_SSL_MAX_CONTENT_LEN 1024
+
+/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
+#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/zephyr/include/flash_map/flash_map.h b/boot/zephyr/include/flash_map/flash_map.h
similarity index 100%
rename from zephyr/include/flash_map/flash_map.h
rename to boot/zephyr/include/flash_map/flash_map.h
diff --git a/zephyr/include/hal/hal_bsp.h b/boot/zephyr/include/hal/hal_bsp.h
similarity index 100%
rename from zephyr/include/hal/hal_bsp.h
rename to boot/zephyr/include/hal/hal_bsp.h
diff --git a/zephyr/include/hal/hal_flash.h b/boot/zephyr/include/hal/hal_flash.h
similarity index 100%
rename from zephyr/include/hal/hal_flash.h
rename to boot/zephyr/include/hal/hal_flash.h
diff --git a/zephyr/include/os/os.h b/boot/zephyr/include/os/os.h
similarity index 100%
rename from zephyr/include/os/os.h
rename to boot/zephyr/include/os/os.h
diff --git a/zephyr/include/os/os_heap.h b/boot/zephyr/include/os/os_heap.h
similarity index 100%
rename from zephyr/include/os/os_heap.h
rename to boot/zephyr/include/os/os_heap.h
diff --git a/zephyr/include/os/os_malloc.h b/boot/zephyr/include/os/os_malloc.h
similarity index 100%
rename from zephyr/include/os/os_malloc.h
rename to boot/zephyr/include/os/os_malloc.h
diff --git a/zephyr/include/syscfg/syscfg.h b/boot/zephyr/include/syscfg/syscfg.h
similarity index 100%
rename from zephyr/include/syscfg/syscfg.h
rename to boot/zephyr/include/syscfg/syscfg.h
diff --git a/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
similarity index 100%
rename from zephyr/include/sysflash/sysflash.h
rename to boot/zephyr/include/sysflash/sysflash.h
diff --git a/zephyr/src/keys.c b/boot/zephyr/keys.c
similarity index 100%
rename from zephyr/src/keys.c
rename to boot/zephyr/keys.c
diff --git a/zephyr/src/main.c b/boot/zephyr/main.c
similarity index 100%
rename from zephyr/src/main.c
rename to boot/zephyr/main.c
diff --git a/zephyr/src/os.c b/boot/zephyr/os.c
similarity index 100%
rename from zephyr/src/os.c
rename to boot/zephyr/os.c
diff --git a/zephyr/prj.conf b/boot/zephyr/prj.conf
similarity index 100%
rename from zephyr/prj.conf
rename to boot/zephyr/prj.conf
diff --git a/zephyr/target.sh.example b/boot/zephyr/target.sh.example
similarity index 100%
rename from zephyr/target.sh.example
rename to boot/zephyr/target.sh.example
diff --git a/zephyr/build_boot.sh b/build_boot.sh
similarity index 66%
rename from zephyr/build_boot.sh
rename to build_boot.sh
index 2fc8326..b998812 100755
--- a/zephyr/build_boot.sh
+++ b/build_boot.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
 source $(dirname 0)/target.sh
-source ../../zephyr/zephyr-env.sh
+source ../zephyr/zephyr-env.sh
 
 make BOARD=$BOARD "$@"
diff --git a/zephyr/Makefile b/zephyr/Makefile
deleted file mode 100644
index 4de50f9..0000000
--- a/zephyr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOARD ?= qemu_x86
-CONF_FILE = prj.conf
-
-include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/zephyr/src/Makefile b/zephyr/src/Makefile
deleted file mode 100644
index 69283e3..0000000
--- a/zephyr/src/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-subdir-ccflags-y += -I$(PROJECT)/../boot/bootutil/include
-subdir-ccflags-y += -I$(PROJECT)/include
-
-obj-y += main.o
-obj-y += flash_map.o hal_flash.o os.o
-obj-y += keys.o
-
-obj-y += ../../boot/bootutil/src/