diff --git a/Makefile b/Makefile
deleted file mode 100644
index dca328a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#UCPP makefile
-
-# Default target
-all: force
-	cd PPC603gnu && exec "$(MAKE)" -f Makefile_linux
-
-# Don't do anything for the "Makefile" target
-Makefile: ;
-
-# Recursively run all other targets
-%: force
-	cd PPC603gnu && exec "$(MAKE)" -f Makefile_linux "$*"
-
-force: ;
-
diff --git a/build b/build
new file mode 100755
index 0000000..ad9c7b0
--- /dev/null
+++ b/build
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd src
+make && cp PPC603gnu/src/Debug/src.out ../bin/Zaphod.out
+cd ..
diff --git a/configure b/configure
new file mode 100755
index 0000000..e6808bc
--- /dev/null
+++ b/configure
@@ -0,0 +1,7 @@
+#!/bin/bash
+git submodule init
+git submodule update
+export PATH=$PATH:$(pwd)/bin/ucpp/ucpp
+cd src
+ucpp init -t 2059
+ucpp configure
diff --git a/src/.wrmakefile b/src/.wrmakefile
new file mode 100755
index 0000000..6ad1e05
--- /dev/null
+++ b/src/.wrmakefile
@@ -0,0 +1,48 @@
+# The file ".wrmakefile" is the template used by the Wind River Workbench to
+# generate the makefiles of this project. Add user-specific build targets and
+# make rules only(!) in this project's ".wrmakefile" file. These will then be
+# automatically dumped into the makefiles.
+
+WIND_HOME := $(subst \,/,$(WIND_HOME))
+WIND_BASE := $(subst \,/,$(WIND_BASE))
+WIND_USR := $(subst \,/,$(WIND_USR))
+
+all : pre_build main_all post_build
+
+_clean ::
+	@echo "make: removing targets and objects of `pwd`"
+
+%IDE_GENERATED%
+
+-include $(PRJ_ROOT_DIR)/*.makefile
+
+-include *.makefile
+
+main_all : external_build $(PROJECT_TARGETS)
+	@echo "make: built targets of `pwd`"
+
+# entry point for extending the build
+external_build ::
+	@echo ""
+
+# main entry point for pre processing prior to the build
+pre_build :: $(PRE_BUILD_STEP) generate_sources
+	@echo ""
+
+# entry point for generating sources prior to the build
+generate_sources ::
+	@echo ""
+
+# main entry point for post processing after the build
+post_build :: $(POST_BUILD_STEP) deploy_output
+	@echo ""
+
+# entry point for deploying output after the build
+deploy_output ::
+	@echo ""
+
+clean :: external_clean $(CLEAN_STEP) _clean
+
+# entry point for extending the build clean
+external_clean ::
+	@echo ""
diff --git a/Definitions.h b/src/Definitions.h
similarity index 100%
rename from Definitions.h
rename to src/Definitions.h
diff --git a/Subsystems/Collector.cpp b/src/Subsystems/Collector.cpp
similarity index 100%
rename from Subsystems/Collector.cpp
rename to src/Subsystems/Collector.cpp
diff --git a/Subsystems/Collector.h b/src/Subsystems/Collector.h
similarity index 100%
rename from Subsystems/Collector.h
rename to src/Subsystems/Collector.h
diff --git a/Subsystems/Compressor.cpp b/src/Subsystems/Compressor.cpp
similarity index 100%
rename from Subsystems/Compressor.cpp
rename to src/Subsystems/Compressor.cpp
diff --git a/Subsystems/Compressor.h b/src/Subsystems/Compressor.h
similarity index 100%
rename from Subsystems/Compressor.h
rename to src/Subsystems/Compressor.h
diff --git a/Subsystems/Controller.cpp b/src/Subsystems/Controller.cpp
similarity index 100%
rename from Subsystems/Controller.cpp
rename to src/Subsystems/Controller.cpp
diff --git a/Subsystems/Controller.h b/src/Subsystems/Controller.h
similarity index 100%
rename from Subsystems/Controller.h
rename to src/Subsystems/Controller.h
diff --git a/Subsystems/Shooter.cpp b/src/Subsystems/Shooter.cpp
similarity index 100%
rename from Subsystems/Shooter.cpp
rename to src/Subsystems/Shooter.cpp
diff --git a/Subsystems/Shooter.h b/src/Subsystems/Shooter.h
similarity index 100%
rename from Subsystems/Shooter.h
rename to src/Subsystems/Shooter.h
diff --git a/ZaphodBase.cpp b/src/ZaphodBase.cpp
similarity index 100%
rename from ZaphodBase.cpp
rename to src/ZaphodBase.cpp
diff --git a/ZaphodBase.h b/src/ZaphodBase.h
similarity index 100%
rename from ZaphodBase.h
rename to src/ZaphodBase.h
diff --git a/ZaphodRobot.cpp b/src/ZaphodRobot.cpp
similarity index 100%
rename from ZaphodRobot.cpp
rename to src/ZaphodRobot.cpp
diff --git a/ZaphodRobot.h b/src/ZaphodRobot.h
similarity index 100%
rename from ZaphodRobot.h
rename to src/ZaphodRobot.h