diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 8cd968c..0000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "matcha"
-version = "0.1.0"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-libtock = { path = "../libtock-rs" }
-libtock_core = { path = "../libtock-rs/core" }
-libtock_codegen = { path = "../libtock-rs/codegen" }
diff --git a/.cargo/config.toml b/app/.cargo/config.toml
similarity index 86%
rename from .cargo/config.toml
rename to app/.cargo/config.toml
index 62f8ccd..63e62c3 100644
--- a/.cargo/config.toml
+++ b/app/.cargo/config.toml
@@ -1,6 +1,6 @@
 [build]
 target = "riscv32imc-unknown-none-elf"
-target-dir = "../../out/matcha"
+target-dir = "../../../out/matcha"
 rustflags = [
     "-C", "relocation-model=static",
     "-C", "link-arg=-Tlayout_matcha.ld",
diff --git a/app/Cargo.toml b/app/Cargo.toml
new file mode 100644
index 0000000..f1952ac
--- /dev/null
+++ b/app/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "matcha"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+libtock         = { path = "../../libtock-rs" }
+libtock_core    = { path = "../../libtock-rs/core" }
+libtock_codegen = { path = "../../libtock-rs/codegen" }
diff --git a/layout_generic.ld b/app/layout_generic.ld
similarity index 100%
rename from layout_generic.ld
rename to app/layout_generic.ld
diff --git a/layout_matcha.ld b/app/layout_matcha.ld
similarity index 100%
rename from layout_matcha.ld
rename to app/layout_matcha.ld
diff --git a/rust-toolchain b/app/rust-toolchain
similarity index 100%
rename from rust-toolchain
rename to app/rust-toolchain
diff --git a/src/main.rs b/app/src/main.rs
similarity index 100%
rename from src/main.rs
rename to app/src/main.rs