diff --git a/.gitignore b/.gitignore
index 1db215cf..9f7304ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ table.py
 reference/hardware/v0.2/~$schematic v0.2_bom.xlsx
 
 reference/hardware/v0.4/gerbers/Archive.zip
+.pioenvs
+.piolibdeps
+.clang_complete
+.gcc-flags.json
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..2c4ff5c9
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,65 @@
+# Continuous Integration (CI) is the practice, in software
+# engineering, of merging all developer working copies with a shared mainline
+# several times a day < http://docs.platformio.org/page/ci/index.html >
+#
+# Documentation:
+#
+# * Travis CI Embedded Builds with PlatformIO
+#   < https://docs.travis-ci.com/user/integration/platformio/ >
+#
+# * PlatformIO integration with Travis CI
+#   < http://docs.platformio.org/page/ci/travis.html >
+#
+# * User Guide for `platformio ci` command
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
+#
+#
+# Please choice one of the following templates (proposed below) and uncomment
+# it (remove "# " before each line) or use own configuration according to the
+# Travis CI documentation (see above).
+#
+
+
+#
+# Template #1: General project. Test it using existing `platformio.ini`.
+#
+
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio run
+
+
+#
+# Template #2: The project is intended to by used as a library with examples
+#
+
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# env:
+#     - PLATFORMIO_CI_SRC=path/to/test/file.c
+#     - PLATFORMIO_CI_SRC=examples/file.ino
+#     - PLATFORMIO_CI_SRC=path/to/test/directory
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
diff --git a/lib/readme.txt b/lib/readme.txt
new file mode 100644
index 00000000..dbadc3d6
--- /dev/null
+++ b/lib/readme.txt
@@ -0,0 +1,36 @@
+
+This directory is intended for the project specific (private) libraries.
+PlatformIO will compile them to static libraries and link to executable file.
+
+The source code of each library should be placed in separate directory, like
+"lib/private_lib/[here are source files]".
+
+For example, see how can be organized `Foo` and `Bar` libraries:
+
+|--lib
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |- readme.txt --> THIS FILE
+|- platformio.ini
+|--src
+   |- main.c
+
+Then in `src/main.c` you should use:
+
+#include <Foo.h>
+#include <Bar.h>
+
+// rest H/C/CPP code
+
+PlatformIO will find your libraries automatically, configure preprocessor's
+include paths and build them.
+
+More information about PlatformIO Library Dependency Finder
+- http://docs.platformio.org/page/librarymanager/ldf.html
diff --git a/platformio.ini b/platformio.ini
new file mode 100644
index 00000000..17ab5880
--- /dev/null
+++ b/platformio.ini
@@ -0,0 +1,27 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+
+[env:megaatmega2560]
+platform=atmelavr
+board=megaatmega2560
+framework=arduino
+build_unflags = -Os
+build_flags = -O3 -ffast-math
+lib_deps = EEPROM
+
+[env:teensy35]
+platform=teensy
+board=teensy35
+framework=arduino
+lib_deps = EEPROM, FlexCAN
+
+[platformio]
+src_dir=speeduino
+env_default = megaatmega2560, teensy35
diff --git a/auxiliaries.h b/speeduino/auxiliaries.h
similarity index 100%
rename from auxiliaries.h
rename to speeduino/auxiliaries.h
diff --git a/auxiliaries.ino b/speeduino/auxiliaries.ino
similarity index 100%
rename from auxiliaries.ino
rename to speeduino/auxiliaries.ino
diff --git a/cancomms.h b/speeduino/cancomms.h
similarity index 100%
rename from cancomms.h
rename to speeduino/cancomms.h
diff --git a/cancomms.ino b/speeduino/cancomms.ino
similarity index 100%
rename from cancomms.ino
rename to speeduino/cancomms.ino
diff --git a/comms.h b/speeduino/comms.h
similarity index 100%
rename from comms.h
rename to speeduino/comms.h
diff --git a/comms.ino b/speeduino/comms.ino
similarity index 100%
rename from comms.ino
rename to speeduino/comms.ino
diff --git a/corrections.h b/speeduino/corrections.h
similarity index 100%
rename from corrections.h
rename to speeduino/corrections.h
diff --git a/corrections.ino b/speeduino/corrections.ino
similarity index 100%
rename from corrections.ino
rename to speeduino/corrections.ino
diff --git a/decoders.h b/speeduino/decoders.h
similarity index 100%
rename from decoders.h
rename to speeduino/decoders.h
diff --git a/decoders.ino b/speeduino/decoders.ino
similarity index 100%
rename from decoders.ino
rename to speeduino/decoders.ino
diff --git a/display.h b/speeduino/display.h
similarity index 100%
rename from display.h
rename to speeduino/display.h
diff --git a/display.ino b/speeduino/display.ino
similarity index 100%
rename from display.ino
rename to speeduino/display.ino
diff --git a/errors.h b/speeduino/errors.h
similarity index 100%
rename from errors.h
rename to speeduino/errors.h
diff --git a/errors.ino b/speeduino/errors.ino
similarity index 100%
rename from errors.ino
rename to speeduino/errors.ino
diff --git a/globals.h b/speeduino/globals.h
similarity index 100%
rename from globals.h
rename to speeduino/globals.h
diff --git a/idle.h b/speeduino/idle.h
similarity index 100%
rename from idle.h
rename to speeduino/idle.h
diff --git a/idle.ino b/speeduino/idle.ino
similarity index 100%
rename from idle.ino
rename to speeduino/idle.ino
diff --git a/maths.h b/speeduino/maths.h
similarity index 100%
rename from maths.h
rename to speeduino/maths.h
diff --git a/maths.ino b/speeduino/maths.ino
similarity index 100%
rename from maths.ino
rename to speeduino/maths.ino
diff --git a/scheduledIO.h b/speeduino/scheduledIO.h
similarity index 100%
rename from scheduledIO.h
rename to speeduino/scheduledIO.h
diff --git a/scheduledIO.ino b/speeduino/scheduledIO.ino
similarity index 100%
rename from scheduledIO.ino
rename to speeduino/scheduledIO.ino
diff --git a/scheduler.h b/speeduino/scheduler.h
similarity index 100%
rename from scheduler.h
rename to speeduino/scheduler.h
diff --git a/scheduler.ino b/speeduino/scheduler.ino
similarity index 100%
rename from scheduler.ino
rename to speeduino/scheduler.ino
diff --git a/sensors.h b/speeduino/sensors.h
similarity index 100%
rename from sensors.h
rename to speeduino/sensors.h
diff --git a/sensors.ino b/speeduino/sensors.ino
similarity index 100%
rename from sensors.ino
rename to speeduino/sensors.ino
diff --git a/speeduino.ino b/speeduino/speeduino.ino
similarity index 99%
rename from speeduino.ino
rename to speeduino/speeduino.ino
index 3f06c184..f9e2b07d 100644
--- a/speeduino.ino
+++ b/speeduino/speeduino.ino
@@ -1017,7 +1017,7 @@ void loop()
       else
       {
         long rpm_adjust = ((long)(micros() - toothOneTime) * (long)currentStatus.rpmDOT) / 1000000; //Take into account any likely accleration that has occurred since the last full revolution completed
-        
+
         //timePerDegree = DIV_ROUND_CLOSEST(166666L, (currentStatus.RPM + rpm_adjust));
         timePerDegree = ldiv( 166666L, currentStatus.RPM + rpm_adjust).quot; //There is a small amount of rounding in this calculation, however it is less than 0.001 of a uS (Faster as ldiv than / )
       }
diff --git a/src/Adafruit_SSD1306/Adafruit_GFX.cpp b/speeduino/src/Adafruit_SSD1306/Adafruit_GFX.cpp
similarity index 100%
rename from src/Adafruit_SSD1306/Adafruit_GFX.cpp
rename to speeduino/src/Adafruit_SSD1306/Adafruit_GFX.cpp
diff --git a/src/Adafruit_SSD1306/Adafruit_GFX.h b/speeduino/src/Adafruit_SSD1306/Adafruit_GFX.h
similarity index 100%
rename from src/Adafruit_SSD1306/Adafruit_GFX.h
rename to speeduino/src/Adafruit_SSD1306/Adafruit_GFX.h
diff --git a/src/Adafruit_SSD1306/Adafruit_SSD1306.cpp b/speeduino/src/Adafruit_SSD1306/Adafruit_SSD1306.cpp
similarity index 100%
rename from src/Adafruit_SSD1306/Adafruit_SSD1306.cpp
rename to speeduino/src/Adafruit_SSD1306/Adafruit_SSD1306.cpp
diff --git a/src/Adafruit_SSD1306/Adafruit_SSD1306.h b/speeduino/src/Adafruit_SSD1306/Adafruit_SSD1306.h
similarity index 100%
rename from src/Adafruit_SSD1306/Adafruit_SSD1306.h
rename to speeduino/src/Adafruit_SSD1306/Adafruit_SSD1306.h
diff --git a/src/Adafruit_SSD1306/README.txt b/speeduino/src/Adafruit_SSD1306/README.txt
similarity index 100%
rename from src/Adafruit_SSD1306/README.txt
rename to speeduino/src/Adafruit_SSD1306/README.txt
diff --git a/src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino b/speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
similarity index 100%
rename from src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
rename to speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino
diff --git a/src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino b/speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
similarity index 100%
rename from src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
rename to speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino
diff --git a/src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino b/speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
similarity index 100%
rename from src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
rename to speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino
diff --git a/src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino b/speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
similarity index 100%
rename from src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
rename to speeduino/src/Adafruit_SSD1306/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino
diff --git a/src/Adafruit_SSD1306/glcdfont.c b/speeduino/src/Adafruit_SSD1306/glcdfont.c
similarity index 100%
rename from src/Adafruit_SSD1306/glcdfont.c
rename to speeduino/src/Adafruit_SSD1306/glcdfont.c
diff --git a/src/Adafruit_SSD1306/license.txt b/speeduino/src/Adafruit_SSD1306/license.txt
similarity index 100%
rename from src/Adafruit_SSD1306/license.txt
rename to speeduino/src/Adafruit_SSD1306/license.txt
diff --git a/src/DigitalWriteFast/digitalWriteFast.h b/speeduino/src/DigitalWriteFast/digitalWriteFast.h
similarity index 100%
rename from src/DigitalWriteFast/digitalWriteFast.h
rename to speeduino/src/DigitalWriteFast/digitalWriteFast.h
diff --git a/src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino b/speeduino/src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino
similarity index 100%
rename from src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino
rename to speeduino/src/PID_v1/Examples/PID_AdaptiveTunings/PID_AdaptiveTunings.ino
diff --git a/src/PID_v1/Examples/PID_Basic/PID_Basic.ino b/speeduino/src/PID_v1/Examples/PID_Basic/PID_Basic.ino
similarity index 100%
rename from src/PID_v1/Examples/PID_Basic/PID_Basic.ino
rename to speeduino/src/PID_v1/Examples/PID_Basic/PID_Basic.ino
diff --git a/src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino b/speeduino/src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino
similarity index 100%
rename from src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino
rename to speeduino/src/PID_v1/Examples/PID_RelayOutput/PID_RelayOutput.ino
diff --git a/src/PID_v1/PID_v1.cpp b/speeduino/src/PID_v1/PID_v1.cpp
similarity index 100%
rename from src/PID_v1/PID_v1.cpp
rename to speeduino/src/PID_v1/PID_v1.cpp
diff --git a/src/PID_v1/PID_v1.h b/speeduino/src/PID_v1/PID_v1.h
similarity index 100%
rename from src/PID_v1/PID_v1.h
rename to speeduino/src/PID_v1/PID_v1.h
diff --git a/src/PID_v1/keywords.txt b/speeduino/src/PID_v1/keywords.txt
similarity index 100%
rename from src/PID_v1/keywords.txt
rename to speeduino/src/PID_v1/keywords.txt
diff --git a/storage.h b/speeduino/storage.h
similarity index 100%
rename from storage.h
rename to speeduino/storage.h
diff --git a/storage.ino b/speeduino/storage.ino
similarity index 100%
rename from storage.ino
rename to speeduino/storage.ino
diff --git a/table.h b/speeduino/table.h
similarity index 100%
rename from table.h
rename to speeduino/table.h
diff --git a/table.ino b/speeduino/table.ino
similarity index 100%
rename from table.ino
rename to speeduino/table.ino
diff --git a/timers.h b/speeduino/timers.h
similarity index 100%
rename from timers.h
rename to speeduino/timers.h
diff --git a/timers.ino b/speeduino/timers.ino
similarity index 100%
rename from timers.ino
rename to speeduino/timers.ino
diff --git a/utils.h b/speeduino/utils.h
similarity index 100%
rename from utils.h
rename to speeduino/utils.h
diff --git a/utils.ino b/speeduino/utils.ino
similarity index 100%
rename from utils.ino
rename to speeduino/utils.ino