diff --git a/rtic/.cargo/config.toml b/.cargo/config.toml
similarity index 100%
rename from rtic/.cargo/config.toml
rename to .cargo/config.toml
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000000..820d4aaade
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,28 @@
+[workspace]
+members = [
+    "rtic",
+    "xtask",
+]
+
+[profile.release]
+codegen-units = 1
+lto = true
+
+# do not optimize proc-macro deps or build scripts
+[profile.dev.build-override]
+codegen-units = 16
+debug = false
+debug-assertions = false
+opt-level = 0
+overflow-checks = false
+
+
+[profile.release.build-override]
+codegen-units = 16
+debug = false
+debug-assertions = false
+opt-level = 0
+overflow-checks = false
+
+[patch.crates-io]
+lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
diff --git a/rtic/macros/.gitignore b/rtic-macros/.gitignore
similarity index 100%
rename from rtic/macros/.gitignore
rename to rtic-macros/.gitignore
diff --git a/rtic/macros/Cargo.toml b/rtic-macros/Cargo.toml
similarity index 100%
rename from rtic/macros/Cargo.toml
rename to rtic-macros/Cargo.toml
diff --git a/rtic/macros/src/analyze.rs b/rtic-macros/src/analyze.rs
similarity index 100%
rename from rtic/macros/src/analyze.rs
rename to rtic-macros/src/analyze.rs
diff --git a/rtic/macros/src/bindings.rs b/rtic-macros/src/bindings.rs
similarity index 100%
rename from rtic/macros/src/bindings.rs
rename to rtic-macros/src/bindings.rs
diff --git a/rtic/macros/src/check.rs b/rtic-macros/src/check.rs
similarity index 100%
rename from rtic/macros/src/check.rs
rename to rtic-macros/src/check.rs
diff --git a/rtic/macros/src/codegen.rs b/rtic-macros/src/codegen.rs
similarity index 100%
rename from rtic/macros/src/codegen.rs
rename to rtic-macros/src/codegen.rs
diff --git a/rtic/macros/src/codegen/assertions.rs b/rtic-macros/src/codegen/assertions.rs
similarity index 100%
rename from rtic/macros/src/codegen/assertions.rs
rename to rtic-macros/src/codegen/assertions.rs
diff --git a/rtic/macros/src/codegen/async_dispatchers.rs b/rtic-macros/src/codegen/async_dispatchers.rs
similarity index 100%
rename from rtic/macros/src/codegen/async_dispatchers.rs
rename to rtic-macros/src/codegen/async_dispatchers.rs
diff --git a/rtic/macros/src/codegen/hardware_tasks.rs b/rtic-macros/src/codegen/hardware_tasks.rs
similarity index 100%
rename from rtic/macros/src/codegen/hardware_tasks.rs
rename to rtic-macros/src/codegen/hardware_tasks.rs
diff --git a/rtic/macros/src/codegen/idle.rs b/rtic-macros/src/codegen/idle.rs
similarity index 100%
rename from rtic/macros/src/codegen/idle.rs
rename to rtic-macros/src/codegen/idle.rs
diff --git a/rtic/macros/src/codegen/init.rs b/rtic-macros/src/codegen/init.rs
similarity index 100%
rename from rtic/macros/src/codegen/init.rs
rename to rtic-macros/src/codegen/init.rs
diff --git a/rtic/macros/src/codegen/local_resources.rs b/rtic-macros/src/codegen/local_resources.rs
similarity index 100%
rename from rtic/macros/src/codegen/local_resources.rs
rename to rtic-macros/src/codegen/local_resources.rs
diff --git a/rtic/macros/src/codegen/local_resources_struct.rs b/rtic-macros/src/codegen/local_resources_struct.rs
similarity index 100%
rename from rtic/macros/src/codegen/local_resources_struct.rs
rename to rtic-macros/src/codegen/local_resources_struct.rs
diff --git a/rtic/macros/src/codegen/main.rs b/rtic-macros/src/codegen/main.rs
similarity index 100%
rename from rtic/macros/src/codegen/main.rs
rename to rtic-macros/src/codegen/main.rs
diff --git a/rtic/macros/src/codegen/module.rs b/rtic-macros/src/codegen/module.rs
similarity index 100%
rename from rtic/macros/src/codegen/module.rs
rename to rtic-macros/src/codegen/module.rs
diff --git a/rtic/macros/src/codegen/post_init.rs b/rtic-macros/src/codegen/post_init.rs
similarity index 100%
rename from rtic/macros/src/codegen/post_init.rs
rename to rtic-macros/src/codegen/post_init.rs
diff --git a/rtic/macros/src/codegen/pre_init.rs b/rtic-macros/src/codegen/pre_init.rs
similarity index 100%
rename from rtic/macros/src/codegen/pre_init.rs
rename to rtic-macros/src/codegen/pre_init.rs
diff --git a/rtic/macros/src/codegen/shared_resources.rs b/rtic-macros/src/codegen/shared_resources.rs
similarity index 100%
rename from rtic/macros/src/codegen/shared_resources.rs
rename to rtic-macros/src/codegen/shared_resources.rs
diff --git a/rtic/macros/src/codegen/shared_resources_struct.rs b/rtic-macros/src/codegen/shared_resources_struct.rs
similarity index 100%
rename from rtic/macros/src/codegen/shared_resources_struct.rs
rename to rtic-macros/src/codegen/shared_resources_struct.rs
diff --git a/rtic/macros/src/codegen/software_tasks.rs b/rtic-macros/src/codegen/software_tasks.rs
similarity index 100%
rename from rtic/macros/src/codegen/software_tasks.rs
rename to rtic-macros/src/codegen/software_tasks.rs
diff --git a/rtic/macros/src/codegen/util.rs b/rtic-macros/src/codegen/util.rs
similarity index 100%
rename from rtic/macros/src/codegen/util.rs
rename to rtic-macros/src/codegen/util.rs
diff --git a/rtic/macros/src/lib.rs b/rtic-macros/src/lib.rs
similarity index 100%
rename from rtic/macros/src/lib.rs
rename to rtic-macros/src/lib.rs
diff --git a/rtic/macros/src/syntax.rs b/rtic-macros/src/syntax.rs
similarity index 100%
rename from rtic/macros/src/syntax.rs
rename to rtic-macros/src/syntax.rs
diff --git a/rtic/macros/src/syntax/.travis.yml b/rtic-macros/src/syntax/.travis.yml
similarity index 100%
rename from rtic/macros/src/syntax/.travis.yml
rename to rtic-macros/src/syntax/.travis.yml
diff --git a/rtic/macros/src/syntax/accessors.rs b/rtic-macros/src/syntax/accessors.rs
similarity index 100%
rename from rtic/macros/src/syntax/accessors.rs
rename to rtic-macros/src/syntax/accessors.rs
diff --git a/rtic/macros/src/syntax/analyze.rs b/rtic-macros/src/syntax/analyze.rs
similarity index 100%
rename from rtic/macros/src/syntax/analyze.rs
rename to rtic-macros/src/syntax/analyze.rs
diff --git a/rtic/macros/src/syntax/ast.rs b/rtic-macros/src/syntax/ast.rs
similarity index 100%
rename from rtic/macros/src/syntax/ast.rs
rename to rtic-macros/src/syntax/ast.rs
diff --git a/rtic/macros/src/syntax/check.rs b/rtic-macros/src/syntax/check.rs
similarity index 100%
rename from rtic/macros/src/syntax/check.rs
rename to rtic-macros/src/syntax/check.rs
diff --git a/rtic/macros/src/syntax/optimize.rs b/rtic-macros/src/syntax/optimize.rs
similarity index 100%
rename from rtic/macros/src/syntax/optimize.rs
rename to rtic-macros/src/syntax/optimize.rs
diff --git a/rtic/macros/src/syntax/parse.rs b/rtic-macros/src/syntax/parse.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse.rs
rename to rtic-macros/src/syntax/parse.rs
diff --git a/rtic/macros/src/syntax/parse/app.rs b/rtic-macros/src/syntax/parse/app.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/app.rs
rename to rtic-macros/src/syntax/parse/app.rs
diff --git a/rtic/macros/src/syntax/parse/hardware_task.rs b/rtic-macros/src/syntax/parse/hardware_task.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/hardware_task.rs
rename to rtic-macros/src/syntax/parse/hardware_task.rs
diff --git a/rtic/macros/src/syntax/parse/idle.rs b/rtic-macros/src/syntax/parse/idle.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/idle.rs
rename to rtic-macros/src/syntax/parse/idle.rs
diff --git a/rtic/macros/src/syntax/parse/init.rs b/rtic-macros/src/syntax/parse/init.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/init.rs
rename to rtic-macros/src/syntax/parse/init.rs
diff --git a/rtic/macros/src/syntax/parse/resource.rs b/rtic-macros/src/syntax/parse/resource.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/resource.rs
rename to rtic-macros/src/syntax/parse/resource.rs
diff --git a/rtic/macros/src/syntax/parse/software_task.rs b/rtic-macros/src/syntax/parse/software_task.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/software_task.rs
rename to rtic-macros/src/syntax/parse/software_task.rs
diff --git a/rtic/macros/src/syntax/parse/util.rs b/rtic-macros/src/syntax/parse/util.rs
similarity index 100%
rename from rtic/macros/src/syntax/parse/util.rs
rename to rtic-macros/src/syntax/parse/util.rs
diff --git a/rtic/macros/tests/ui.rs b/rtic-macros/tests/ui.rs
similarity index 100%
rename from rtic/macros/tests/ui.rs
rename to rtic-macros/tests/ui.rs
diff --git a/rtic/macros/ui/extern-interrupt-used.rs b/rtic-macros/ui/extern-interrupt-used.rs
similarity index 100%
rename from rtic/macros/ui/extern-interrupt-used.rs
rename to rtic-macros/ui/extern-interrupt-used.rs
diff --git a/rtic/macros/ui/extern-interrupt-used.stderr b/rtic-macros/ui/extern-interrupt-used.stderr
similarity index 100%
rename from rtic/macros/ui/extern-interrupt-used.stderr
rename to rtic-macros/ui/extern-interrupt-used.stderr
diff --git a/rtic/macros/ui/idle-double-local.rs b/rtic-macros/ui/idle-double-local.rs
similarity index 100%
rename from rtic/macros/ui/idle-double-local.rs
rename to rtic-macros/ui/idle-double-local.rs
diff --git a/rtic/macros/ui/idle-double-local.stderr b/rtic-macros/ui/idle-double-local.stderr
similarity index 100%
rename from rtic/macros/ui/idle-double-local.stderr
rename to rtic-macros/ui/idle-double-local.stderr
diff --git a/rtic/macros/ui/idle-double-shared.rs b/rtic-macros/ui/idle-double-shared.rs
similarity index 100%
rename from rtic/macros/ui/idle-double-shared.rs
rename to rtic-macros/ui/idle-double-shared.rs
diff --git a/rtic/macros/ui/idle-double-shared.stderr b/rtic-macros/ui/idle-double-shared.stderr
similarity index 100%
rename from rtic/macros/ui/idle-double-shared.stderr
rename to rtic-macros/ui/idle-double-shared.stderr
diff --git a/rtic/macros/ui/idle-input.rs b/rtic-macros/ui/idle-input.rs
similarity index 100%
rename from rtic/macros/ui/idle-input.rs
rename to rtic-macros/ui/idle-input.rs
diff --git a/rtic/macros/ui/idle-input.stderr b/rtic-macros/ui/idle-input.stderr
similarity index 100%
rename from rtic/macros/ui/idle-input.stderr
rename to rtic-macros/ui/idle-input.stderr
diff --git a/rtic/macros/ui/idle-no-context.rs b/rtic-macros/ui/idle-no-context.rs
similarity index 100%
rename from rtic/macros/ui/idle-no-context.rs
rename to rtic-macros/ui/idle-no-context.rs
diff --git a/rtic/macros/ui/idle-no-context.stderr b/rtic-macros/ui/idle-no-context.stderr
similarity index 100%
rename from rtic/macros/ui/idle-no-context.stderr
rename to rtic-macros/ui/idle-no-context.stderr
diff --git a/rtic/macros/ui/idle-not-divergent.rs b/rtic-macros/ui/idle-not-divergent.rs
similarity index 100%
rename from rtic/macros/ui/idle-not-divergent.rs
rename to rtic-macros/ui/idle-not-divergent.rs
diff --git a/rtic/macros/ui/idle-not-divergent.stderr b/rtic-macros/ui/idle-not-divergent.stderr
similarity index 100%
rename from rtic/macros/ui/idle-not-divergent.stderr
rename to rtic-macros/ui/idle-not-divergent.stderr
diff --git a/rtic/macros/ui/idle-output.rs b/rtic-macros/ui/idle-output.rs
similarity index 100%
rename from rtic/macros/ui/idle-output.rs
rename to rtic-macros/ui/idle-output.rs
diff --git a/rtic/macros/ui/idle-output.stderr b/rtic-macros/ui/idle-output.stderr
similarity index 100%
rename from rtic/macros/ui/idle-output.stderr
rename to rtic-macros/ui/idle-output.stderr
diff --git a/rtic/macros/ui/idle-pub.rs b/rtic-macros/ui/idle-pub.rs
similarity index 100%
rename from rtic/macros/ui/idle-pub.rs
rename to rtic-macros/ui/idle-pub.rs
diff --git a/rtic/macros/ui/idle-pub.stderr b/rtic-macros/ui/idle-pub.stderr
similarity index 100%
rename from rtic/macros/ui/idle-pub.stderr
rename to rtic-macros/ui/idle-pub.stderr
diff --git a/rtic/macros/ui/idle-unsafe.rs b/rtic-macros/ui/idle-unsafe.rs
similarity index 100%
rename from rtic/macros/ui/idle-unsafe.rs
rename to rtic-macros/ui/idle-unsafe.rs
diff --git a/rtic/macros/ui/idle-unsafe.stderr b/rtic-macros/ui/idle-unsafe.stderr
similarity index 100%
rename from rtic/macros/ui/idle-unsafe.stderr
rename to rtic-macros/ui/idle-unsafe.stderr
diff --git a/rtic/macros/ui/init-divergent.rs b/rtic-macros/ui/init-divergent.rs
similarity index 100%
rename from rtic/macros/ui/init-divergent.rs
rename to rtic-macros/ui/init-divergent.rs
diff --git a/rtic/macros/ui/init-divergent.stderr b/rtic-macros/ui/init-divergent.stderr
similarity index 100%
rename from rtic/macros/ui/init-divergent.stderr
rename to rtic-macros/ui/init-divergent.stderr
diff --git a/rtic/macros/ui/init-double-local.rs b/rtic-macros/ui/init-double-local.rs
similarity index 100%
rename from rtic/macros/ui/init-double-local.rs
rename to rtic-macros/ui/init-double-local.rs
diff --git a/rtic/macros/ui/init-double-local.stderr b/rtic-macros/ui/init-double-local.stderr
similarity index 100%
rename from rtic/macros/ui/init-double-local.stderr
rename to rtic-macros/ui/init-double-local.stderr
diff --git a/rtic/macros/ui/init-double-shared.rs b/rtic-macros/ui/init-double-shared.rs
similarity index 100%
rename from rtic/macros/ui/init-double-shared.rs
rename to rtic-macros/ui/init-double-shared.rs
diff --git a/rtic/macros/ui/init-double-shared.stderr b/rtic-macros/ui/init-double-shared.stderr
similarity index 100%
rename from rtic/macros/ui/init-double-shared.stderr
rename to rtic-macros/ui/init-double-shared.stderr
diff --git a/rtic/macros/ui/init-input.rs b/rtic-macros/ui/init-input.rs
similarity index 100%
rename from rtic/macros/ui/init-input.rs
rename to rtic-macros/ui/init-input.rs
diff --git a/rtic/macros/ui/init-input.stderr b/rtic-macros/ui/init-input.stderr
similarity index 100%
rename from rtic/macros/ui/init-input.stderr
rename to rtic-macros/ui/init-input.stderr
diff --git a/rtic/macros/ui/init-no-context.rs b/rtic-macros/ui/init-no-context.rs
similarity index 100%
rename from rtic/macros/ui/init-no-context.rs
rename to rtic-macros/ui/init-no-context.rs
diff --git a/rtic/macros/ui/init-no-context.stderr b/rtic-macros/ui/init-no-context.stderr
similarity index 100%
rename from rtic/macros/ui/init-no-context.stderr
rename to rtic-macros/ui/init-no-context.stderr
diff --git a/rtic/macros/ui/init-output.rs b/rtic-macros/ui/init-output.rs
similarity index 100%
rename from rtic/macros/ui/init-output.rs
rename to rtic-macros/ui/init-output.rs
diff --git a/rtic/macros/ui/init-output.stderr b/rtic-macros/ui/init-output.stderr
similarity index 100%
rename from rtic/macros/ui/init-output.stderr
rename to rtic-macros/ui/init-output.stderr
diff --git a/rtic/macros/ui/init-pub.rs b/rtic-macros/ui/init-pub.rs
similarity index 100%
rename from rtic/macros/ui/init-pub.rs
rename to rtic-macros/ui/init-pub.rs
diff --git a/rtic/macros/ui/init-pub.stderr b/rtic-macros/ui/init-pub.stderr
similarity index 100%
rename from rtic/macros/ui/init-pub.stderr
rename to rtic-macros/ui/init-pub.stderr
diff --git a/rtic/macros/ui/init-unsafe.rs b/rtic-macros/ui/init-unsafe.rs
similarity index 100%
rename from rtic/macros/ui/init-unsafe.rs
rename to rtic-macros/ui/init-unsafe.rs
diff --git a/rtic/macros/ui/init-unsafe.stderr b/rtic-macros/ui/init-unsafe.stderr
similarity index 100%
rename from rtic/macros/ui/init-unsafe.stderr
rename to rtic-macros/ui/init-unsafe.stderr
diff --git a/rtic/macros/ui/interrupt-double.rs b/rtic-macros/ui/interrupt-double.rs
similarity index 100%
rename from rtic/macros/ui/interrupt-double.rs
rename to rtic-macros/ui/interrupt-double.rs
diff --git a/rtic/macros/ui/interrupt-double.stderr b/rtic-macros/ui/interrupt-double.stderr
similarity index 100%
rename from rtic/macros/ui/interrupt-double.stderr
rename to rtic-macros/ui/interrupt-double.stderr
diff --git a/rtic/macros/ui/local-collision-2.rs b/rtic-macros/ui/local-collision-2.rs
similarity index 100%
rename from rtic/macros/ui/local-collision-2.rs
rename to rtic-macros/ui/local-collision-2.rs
diff --git a/rtic/macros/ui/local-collision-2.stderr b/rtic-macros/ui/local-collision-2.stderr
similarity index 100%
rename from rtic/macros/ui/local-collision-2.stderr
rename to rtic-macros/ui/local-collision-2.stderr
diff --git a/rtic/macros/ui/local-collision.rs b/rtic-macros/ui/local-collision.rs
similarity index 100%
rename from rtic/macros/ui/local-collision.rs
rename to rtic-macros/ui/local-collision.rs
diff --git a/rtic/macros/ui/local-collision.stderr b/rtic-macros/ui/local-collision.stderr
similarity index 100%
rename from rtic/macros/ui/local-collision.stderr
rename to rtic-macros/ui/local-collision.stderr
diff --git a/rtic/macros/ui/local-malformed-1.rs b/rtic-macros/ui/local-malformed-1.rs
similarity index 100%
rename from rtic/macros/ui/local-malformed-1.rs
rename to rtic-macros/ui/local-malformed-1.rs
diff --git a/rtic/macros/ui/local-malformed-1.stderr b/rtic-macros/ui/local-malformed-1.stderr
similarity index 100%
rename from rtic/macros/ui/local-malformed-1.stderr
rename to rtic-macros/ui/local-malformed-1.stderr
diff --git a/rtic/macros/ui/local-malformed-2.rs b/rtic-macros/ui/local-malformed-2.rs
similarity index 100%
rename from rtic/macros/ui/local-malformed-2.rs
rename to rtic-macros/ui/local-malformed-2.rs
diff --git a/rtic/macros/ui/local-malformed-2.stderr b/rtic-macros/ui/local-malformed-2.stderr
similarity index 100%
rename from rtic/macros/ui/local-malformed-2.stderr
rename to rtic-macros/ui/local-malformed-2.stderr
diff --git a/rtic/macros/ui/local-malformed-3.rs b/rtic-macros/ui/local-malformed-3.rs
similarity index 100%
rename from rtic/macros/ui/local-malformed-3.rs
rename to rtic-macros/ui/local-malformed-3.rs
diff --git a/rtic/macros/ui/local-malformed-3.stderr b/rtic-macros/ui/local-malformed-3.stderr
similarity index 100%
rename from rtic/macros/ui/local-malformed-3.stderr
rename to rtic-macros/ui/local-malformed-3.stderr
diff --git a/rtic/macros/ui/local-malformed-4.rs b/rtic-macros/ui/local-malformed-4.rs
similarity index 100%
rename from rtic/macros/ui/local-malformed-4.rs
rename to rtic-macros/ui/local-malformed-4.rs
diff --git a/rtic/macros/ui/local-malformed-4.stderr b/rtic-macros/ui/local-malformed-4.stderr
similarity index 100%
rename from rtic/macros/ui/local-malformed-4.stderr
rename to rtic-macros/ui/local-malformed-4.stderr
diff --git a/rtic/macros/ui/local-not-declared.rs b/rtic-macros/ui/local-not-declared.rs
similarity index 100%
rename from rtic/macros/ui/local-not-declared.rs
rename to rtic-macros/ui/local-not-declared.rs
diff --git a/rtic/macros/ui/local-not-declared.stderr b/rtic-macros/ui/local-not-declared.stderr
similarity index 100%
rename from rtic/macros/ui/local-not-declared.stderr
rename to rtic-macros/ui/local-not-declared.stderr
diff --git a/rtic/macros/ui/local-pub.rs b/rtic-macros/ui/local-pub.rs
similarity index 100%
rename from rtic/macros/ui/local-pub.rs
rename to rtic-macros/ui/local-pub.rs
diff --git a/rtic/macros/ui/local-pub.stderr b/rtic-macros/ui/local-pub.stderr
similarity index 100%
rename from rtic/macros/ui/local-pub.stderr
rename to rtic-macros/ui/local-pub.stderr
diff --git a/rtic/macros/ui/local-shared-attribute.rs b/rtic-macros/ui/local-shared-attribute.rs
similarity index 100%
rename from rtic/macros/ui/local-shared-attribute.rs
rename to rtic-macros/ui/local-shared-attribute.rs
diff --git a/rtic/macros/ui/local-shared-attribute.stderr b/rtic-macros/ui/local-shared-attribute.stderr
similarity index 100%
rename from rtic/macros/ui/local-shared-attribute.stderr
rename to rtic-macros/ui/local-shared-attribute.stderr
diff --git a/rtic/macros/ui/local-shared.rs b/rtic-macros/ui/local-shared.rs
similarity index 100%
rename from rtic/macros/ui/local-shared.rs
rename to rtic-macros/ui/local-shared.rs
diff --git a/rtic/macros/ui/local-shared.stderr b/rtic-macros/ui/local-shared.stderr
similarity index 100%
rename from rtic/macros/ui/local-shared.stderr
rename to rtic-macros/ui/local-shared.stderr
diff --git a/rtic/macros/ui/shared-lock-free.rs b/rtic-macros/ui/shared-lock-free.rs
similarity index 100%
rename from rtic/macros/ui/shared-lock-free.rs
rename to rtic-macros/ui/shared-lock-free.rs
diff --git a/rtic/macros/ui/shared-lock-free.stderr b/rtic-macros/ui/shared-lock-free.stderr
similarity index 100%
rename from rtic/macros/ui/shared-lock-free.stderr
rename to rtic-macros/ui/shared-lock-free.stderr
diff --git a/rtic/macros/ui/shared-not-declared.rs b/rtic-macros/ui/shared-not-declared.rs
similarity index 100%
rename from rtic/macros/ui/shared-not-declared.rs
rename to rtic-macros/ui/shared-not-declared.rs
diff --git a/rtic/macros/ui/shared-not-declared.stderr b/rtic-macros/ui/shared-not-declared.stderr
similarity index 100%
rename from rtic/macros/ui/shared-not-declared.stderr
rename to rtic-macros/ui/shared-not-declared.stderr
diff --git a/rtic/macros/ui/shared-pub.rs b/rtic-macros/ui/shared-pub.rs
similarity index 100%
rename from rtic/macros/ui/shared-pub.rs
rename to rtic-macros/ui/shared-pub.rs
diff --git a/rtic/macros/ui/shared-pub.stderr b/rtic-macros/ui/shared-pub.stderr
similarity index 100%
rename from rtic/macros/ui/shared-pub.stderr
rename to rtic-macros/ui/shared-pub.stderr
diff --git a/rtic/macros/ui/task-divergent.rs b/rtic-macros/ui/task-divergent.rs
similarity index 100%
rename from rtic/macros/ui/task-divergent.rs
rename to rtic-macros/ui/task-divergent.rs
diff --git a/rtic/macros/ui/task-divergent.stderr b/rtic-macros/ui/task-divergent.stderr
similarity index 100%
rename from rtic/macros/ui/task-divergent.stderr
rename to rtic-macros/ui/task-divergent.stderr
diff --git a/rtic/macros/ui/task-double-local.rs b/rtic-macros/ui/task-double-local.rs
similarity index 100%
rename from rtic/macros/ui/task-double-local.rs
rename to rtic-macros/ui/task-double-local.rs
diff --git a/rtic/macros/ui/task-double-local.stderr b/rtic-macros/ui/task-double-local.stderr
similarity index 100%
rename from rtic/macros/ui/task-double-local.stderr
rename to rtic-macros/ui/task-double-local.stderr
diff --git a/rtic/macros/ui/task-double-priority.rs b/rtic-macros/ui/task-double-priority.rs
similarity index 100%
rename from rtic/macros/ui/task-double-priority.rs
rename to rtic-macros/ui/task-double-priority.rs
diff --git a/rtic/macros/ui/task-double-priority.stderr b/rtic-macros/ui/task-double-priority.stderr
similarity index 100%
rename from rtic/macros/ui/task-double-priority.stderr
rename to rtic-macros/ui/task-double-priority.stderr
diff --git a/rtic/macros/ui/task-double-shared.rs b/rtic-macros/ui/task-double-shared.rs
similarity index 100%
rename from rtic/macros/ui/task-double-shared.rs
rename to rtic-macros/ui/task-double-shared.rs
diff --git a/rtic/macros/ui/task-double-shared.stderr b/rtic-macros/ui/task-double-shared.stderr
similarity index 100%
rename from rtic/macros/ui/task-double-shared.stderr
rename to rtic-macros/ui/task-double-shared.stderr
diff --git a/rtic/macros/ui/task-idle.rs b/rtic-macros/ui/task-idle.rs
similarity index 100%
rename from rtic/macros/ui/task-idle.rs
rename to rtic-macros/ui/task-idle.rs
diff --git a/rtic/macros/ui/task-idle.stderr b/rtic-macros/ui/task-idle.stderr
similarity index 100%
rename from rtic/macros/ui/task-idle.stderr
rename to rtic-macros/ui/task-idle.stderr
diff --git a/rtic/macros/ui/task-init.rs b/rtic-macros/ui/task-init.rs
similarity index 100%
rename from rtic/macros/ui/task-init.rs
rename to rtic-macros/ui/task-init.rs
diff --git a/rtic/macros/ui/task-init.stderr b/rtic-macros/ui/task-init.stderr
similarity index 100%
rename from rtic/macros/ui/task-init.stderr
rename to rtic-macros/ui/task-init.stderr
diff --git a/rtic/macros/ui/task-interrupt.rs b/rtic-macros/ui/task-interrupt.rs
similarity index 100%
rename from rtic/macros/ui/task-interrupt.rs
rename to rtic-macros/ui/task-interrupt.rs
diff --git a/rtic/macros/ui/task-interrupt.stderr b/rtic-macros/ui/task-interrupt.stderr
similarity index 100%
rename from rtic/macros/ui/task-interrupt.stderr
rename to rtic-macros/ui/task-interrupt.stderr
diff --git a/rtic/macros/ui/task-no-context.rs b/rtic-macros/ui/task-no-context.rs
similarity index 100%
rename from rtic/macros/ui/task-no-context.rs
rename to rtic-macros/ui/task-no-context.rs
diff --git a/rtic/macros/ui/task-no-context.stderr b/rtic-macros/ui/task-no-context.stderr
similarity index 100%
rename from rtic/macros/ui/task-no-context.stderr
rename to rtic-macros/ui/task-no-context.stderr
diff --git a/rtic/macros/ui/task-priority-too-high.rs b/rtic-macros/ui/task-priority-too-high.rs
similarity index 100%
rename from rtic/macros/ui/task-priority-too-high.rs
rename to rtic-macros/ui/task-priority-too-high.rs
diff --git a/rtic/macros/ui/task-priority-too-high.stderr b/rtic-macros/ui/task-priority-too-high.stderr
similarity index 100%
rename from rtic/macros/ui/task-priority-too-high.stderr
rename to rtic-macros/ui/task-priority-too-high.stderr
diff --git a/rtic/macros/ui/task-priority-too-low.rs b/rtic-macros/ui/task-priority-too-low.rs
similarity index 100%
rename from rtic/macros/ui/task-priority-too-low.rs
rename to rtic-macros/ui/task-priority-too-low.rs
diff --git a/rtic/macros/ui/task-priority-too-low.stderr b/rtic-macros/ui/task-priority-too-low.stderr
similarity index 100%
rename from rtic/macros/ui/task-priority-too-low.stderr
rename to rtic-macros/ui/task-priority-too-low.stderr
diff --git a/rtic/macros/ui/task-pub.rs b/rtic-macros/ui/task-pub.rs
similarity index 100%
rename from rtic/macros/ui/task-pub.rs
rename to rtic-macros/ui/task-pub.rs
diff --git a/rtic/macros/ui/task-pub.stderr b/rtic-macros/ui/task-pub.stderr
similarity index 100%
rename from rtic/macros/ui/task-pub.stderr
rename to rtic-macros/ui/task-pub.stderr
diff --git a/rtic/macros/ui/task-unsafe.rs b/rtic-macros/ui/task-unsafe.rs
similarity index 100%
rename from rtic/macros/ui/task-unsafe.rs
rename to rtic-macros/ui/task-unsafe.rs
diff --git a/rtic/macros/ui/task-unsafe.stderr b/rtic-macros/ui/task-unsafe.stderr
similarity index 100%
rename from rtic/macros/ui/task-unsafe.stderr
rename to rtic-macros/ui/task-unsafe.stderr
diff --git a/rtic/macros/ui/task-zero-prio.rs b/rtic-macros/ui/task-zero-prio.rs
similarity index 100%
rename from rtic/macros/ui/task-zero-prio.rs
rename to rtic-macros/ui/task-zero-prio.rs
diff --git a/rtic/macros/ui/task-zero-prio.stderr b/rtic-macros/ui/task-zero-prio.stderr
similarity index 100%
rename from rtic/macros/ui/task-zero-prio.stderr
rename to rtic-macros/ui/task-zero-prio.stderr
diff --git a/rtic/Cargo.toml b/rtic/Cargo.toml
index 1aba9c7bf3..9fa9f9d581 100644
--- a/rtic/Cargo.toml
+++ b/rtic/Cargo.toml
@@ -38,7 +38,7 @@ cortex-m = "0.7.0"
 bare-metal = "1.0.0"
 #portable-atomic = { version = "0.3.19" }
 atomic-polyfill = "1"
-rtic-macros = { path = "./macros", version = "2.0.0-alpha.0" }
+rtic-macros = { path = "../rtic-macros", version = "2.0.0-alpha.0" }
 rtic-core = "1"
 
 
@@ -65,32 +65,6 @@ version = "0.6.0"
 [target.x86_64-unknown-linux-gnu.dev-dependencies]
 trybuild = "1"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
-[workspace]
-members = ["macros", "xtask"]
-
-# do not optimize proc-macro deps or build scripts
-[profile.dev.build-override]
-codegen-units = 16
-debug = false
-debug-assertions = false
-opt-level = 0
-overflow-checks = false
-
-
-[profile.release.build-override]
-codegen-units = 16
-debug = false
-debug-assertions = false
-opt-level = 0
-overflow-checks = false
-
-[patch.crates-io]
-lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
-
 [features]
 test-critical-section = ["cortex-m/critical-section-single-core", "rtic-monotonics/systick_100hz"]
 
diff --git a/rtic/rust-toolchain.toml b/rust-toolchain.toml
similarity index 100%
rename from rtic/rust-toolchain.toml
rename to rust-toolchain.toml
diff --git a/rtic/xtask/Cargo.toml b/xtask/Cargo.toml
similarity index 100%
rename from rtic/xtask/Cargo.toml
rename to xtask/Cargo.toml
diff --git a/rtic/xtask/src/build.rs b/xtask/src/build.rs
similarity index 100%
rename from rtic/xtask/src/build.rs
rename to xtask/src/build.rs
diff --git a/rtic/xtask/src/command.rs b/xtask/src/command.rs
similarity index 100%
rename from rtic/xtask/src/command.rs
rename to xtask/src/command.rs
diff --git a/rtic/xtask/src/main.rs b/xtask/src/main.rs
similarity index 97%
rename from rtic/xtask/src/main.rs
rename to xtask/src/main.rs
index eff86686cb..7c0ed20ed2 100644
--- a/rtic/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -116,7 +116,7 @@ fn main() -> anyhow::Result<()> {
 
     let targets = [ARMV7M, ARMV6M];
 
-    let mut examples: Vec<_> = std::fs::read_dir("./examples")?
+    let mut examples: Vec<_> = std::fs::read_dir("./rtic/examples")?
         .filter_map(|p| p.ok())
         .map(|p| p.path())
         .filter(|p| p.display().to_string().ends_with(".rs"))
@@ -207,7 +207,7 @@ fn arm_example(command: &CargoCommand) -> anyhow::Result<()> {
     match *command {
         CargoCommand::Run { example, .. } => {
             let run_file = format!("{example}.run");
-            let expected_output_file = ["ci", "expected", &run_file]
+            let expected_output_file = ["rtic", "ci", "expected", &run_file]
                 .iter()
                 .collect::<PathBuf>()
                 .into_os_string()