diff --git a/.gitignore b/.gitignore
index 15bcc069..b9715789 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,8 @@ ttb_last_config
 auth_secret_test.exs
 auth_secret.exs
 
-# Farmbot argifacts
+# Farmbot artifacts
+overlay
 tmp/
 test_tmp/
 priv/build_calendar.so
diff --git a/lib/farmbot/system/profile.ex b/lib/farmbot/system/profile.ex
index 27cc00ba..46ceac02 100644
--- a/lib/farmbot/system/profile.ex
+++ b/lib/farmbot/system/profile.ex
@@ -23,7 +23,10 @@ defmodule Farmbot.System.Profile do
 
   def profile_dir do
     case Farmbot.Project.target() do
-      "host" -> Path.join(["overlay", "profiles"])
+      "host" ->
+        path = Path.join(["overlay", "profiles"])
+        Path.mkdir_p!path)
+        path
       _ -> "/profiles"
     end
   end
diff --git a/mix.exs b/mix.exs
index 7e7b5585..0446ea8f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -178,11 +178,11 @@ defmodule Farmbot.Mixfile do
   end
 
   defp elixirc_paths(:test, "host") do
-    ["./lib", "./nerves/host", "./test/support"]
+    ["./lib", "./platform/host", "./test/support"]
   end
 
   defp elixirc_paths(_, "host") do
-    ["./lib", "./nerves/host"]
+    ["./lib", "./platform/host"]
   end
 
   defp elixirc_paths(_env, _target) do
diff --git a/overlay/profiles/.gitignore b/overlay/profiles/.gitignore
deleted file mode 100644
index 2d087570..00000000
--- a/overlay/profiles/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.exs
diff --git a/nerves/host/bootstrap/configurator.ex b/platform/host/bootstrap/configurator.ex
similarity index 100%
rename from nerves/host/bootstrap/configurator.ex
rename to platform/host/bootstrap/configurator.ex
diff --git a/nerves/host/bootstrap/target_configurator_test.ex b/platform/host/bootstrap/target_configurator_test.ex
similarity index 100%
rename from nerves/host/bootstrap/target_configurator_test.ex
rename to platform/host/bootstrap/target_configurator_test.ex
diff --git a/nerves/host/bootstrap/target_configurator_test_supervisor.ex b/platform/host/bootstrap/target_configurator_test_supervisor.ex
similarity index 100%
rename from nerves/host/bootstrap/target_configurator_test_supervisor.ex
rename to platform/host/bootstrap/target_configurator_test_supervisor.ex
diff --git a/nerves/host/nerves_firmware.ex b/platform/host/nerves_firmware.ex
similarity index 100%
rename from nerves/host/nerves_firmware.ex
rename to platform/host/nerves_firmware.ex
diff --git a/nerves/host/system_tasks.ex b/platform/host/system_tasks.ex
similarity index 100%
rename from nerves/host/system_tasks.ex
rename to platform/host/system_tasks.ex
diff --git a/nerves/host/update_handler.ex b/platform/host/update_handler.ex
similarity index 100%
rename from nerves/host/update_handler.ex
rename to platform/host/update_handler.ex
diff --git a/nerves/target/bootstrap/configurator/captive_portal/captive_portal.ex b/platform/target/bootstrap/configurator/captive_portal/captive_portal.ex
similarity index 100%
rename from nerves/target/bootstrap/configurator/captive_portal/captive_portal.ex
rename to platform/target/bootstrap/configurator/captive_portal/captive_portal.ex
diff --git a/nerves/target/bootstrap/configurator/captive_portal/hostapd.ex b/platform/target/bootstrap/configurator/captive_portal/hostapd.ex
similarity index 100%
rename from nerves/target/bootstrap/configurator/captive_portal/hostapd.ex
rename to platform/target/bootstrap/configurator/captive_portal/hostapd.ex
diff --git a/nerves/target/bootstrap/configurator/configurator.ex b/platform/target/bootstrap/configurator/configurator.ex
similarity index 100%
rename from nerves/target/bootstrap/configurator/configurator.ex
rename to platform/target/bootstrap/configurator/configurator.ex
diff --git a/nerves/target/bootstrap/configurator/router.ex b/platform/target/bootstrap/configurator/router.ex
similarity index 100%
rename from nerves/target/bootstrap/configurator/router.ex
rename to platform/target/bootstrap/configurator/router.ex
diff --git a/nerves/target/bootstrap/network/manager.ex b/platform/target/bootstrap/network/manager.ex
similarity index 100%
rename from nerves/target/bootstrap/network/manager.ex
rename to platform/target/bootstrap/network/manager.ex
diff --git a/nerves/target/bootstrap/network/ntp.ex b/platform/target/bootstrap/network/ntp.ex
similarity index 100%
rename from nerves/target/bootstrap/network/ntp.ex
rename to platform/target/bootstrap/network/ntp.ex
diff --git a/nerves/target/bootstrap/network/tzdata_task.ex b/platform/target/bootstrap/network/tzdata_task.ex
similarity index 100%
rename from nerves/target/bootstrap/network/tzdata_task.ex
rename to platform/target/bootstrap/network/tzdata_task.ex
diff --git a/nerves/target/bootstrap/network/wait_for_time.ex b/platform/target/bootstrap/network/wait_for_time.ex
similarity index 100%
rename from nerves/target/bootstrap/network/wait_for_time.ex
rename to platform/target/bootstrap/network/wait_for_time.ex
diff --git a/nerves/target/bootstrap/protocols.ex b/platform/target/bootstrap/protocols.ex
similarity index 100%
rename from nerves/target/bootstrap/protocols.ex
rename to platform/target/bootstrap/protocols.ex
diff --git a/nerves/target/gpio/ale_handler.ex b/platform/target/gpio/ale_handler.ex
similarity index 100%
rename from nerves/target/gpio/ale_handler.ex
rename to platform/target/gpio/ale_handler.ex
diff --git a/nerves/target/network.ex b/platform/target/network.ex
similarity index 100%
rename from nerves/target/network.ex
rename to platform/target/network.ex
diff --git a/nerves/target/system_tasks.ex b/platform/target/system_tasks.ex
similarity index 100%
rename from nerves/target/system_tasks.ex
rename to platform/target/system_tasks.ex
diff --git a/nerves/target/uevent.ex b/platform/target/uevent.ex
similarity index 100%
rename from nerves/target/uevent.ex
rename to platform/target/uevent.ex
diff --git a/nerves/target/update_handler.ex b/platform/target/update_handler.ex
similarity index 100%
rename from nerves/target/update_handler.ex
rename to platform/target/update_handler.ex