diff --git a/.gitmodules b/.gitmodules
index 361a3c85..b68fcc2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "test/googletest"]
-	path = test/googletest
+[submodule "contrib/test/googletest"]
+	path = contrib/test/googletest
 	url = https://github.com/google/googletest.git
-[submodule "test/arduino-mock"]
-	path = test/arduino-mock
+[submodule "contrib/test/arduino-mock"]
+	path = contrib/test/arduino-mock
 	url = https://github.com/ed7coyne/arduino-mock.git
diff --git a/.travis.yml b/.travis.yml
index 30058eca..9d30c387 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,9 @@ before_script:
 - ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.6.7 ArduinoJson && ln -s ${HOME}/SoftwareSerial ./ && ln -s ${HOME}/Adafruit_NeoPixel ./ && ln -s ${HOME}/Adafruit-GFX-Library ./ && ln -s ${HOME}/Adafruit_SSD1306 ./)
 script:
 - ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino
 - ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseNeoPixel_ESP8266/FirebaseNeoPixel_ESP8266.ino
 - ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseStream_ESP8266/FirebaseStream_ESP8266.ino
 - ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseRoom_ESP8266/FirebaseRoom_ESP8266.ino
-- ( cd test && make check )
-- ( cd test/modem/ && make test )
-- test/travis/check_all_examples_use_standard_init.sh
+- ( cd contrib/test && make check )
+- ( cd contrib/test/modem/ && make test )
+- contrib/test/travis/check_all_examples_use_standard_init.sh
diff --git a/contrib/README.md b/contrib/README.md
new file mode 100644
index 00000000..40aba8cb
--- /dev/null
+++ b/contrib/README.md
@@ -0,0 +1,8 @@
+# firebase-arduino contrib
+
+The `contrib` features projects around `firebase-arduino` library:
+
+- `modem`: a firmware implementing a `UART` modem for firebase
+- `firethings`: a firmware implementing `GPIO` state syncing with firebase
+- `hardware`: hardware design for `ESP8266` reference boards
+- `test`: test suite and mocks
diff --git a/examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino b/contrib/examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino
similarity index 100%
rename from examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino
rename to contrib/examples/FirebaseSerialHost_ESP8266/FirebaseSerialHost_ESP8266.ino
diff --git a/examples/FirebaseSerialTerminal_ESP8266/FirebaseSerialTerminal_ESP8266.ino b/contrib/examples/FirebaseSerialTerminal_ESP8266/FirebaseSerialTerminal_ESP8266.ino
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/FirebaseSerialTerminal_ESP8266.ino
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/FirebaseSerialTerminal_ESP8266.ino
diff --git a/examples/FirebaseSerialTerminal_ESP8266/begin.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/begin.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/begin.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/begin.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/begin_stream.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/begin_stream.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/begin_stream.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/begin_stream.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/end_stream.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/end_stream.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/end_stream.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/end_stream.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/get.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/get.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/get.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/get.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/get_push.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/get_push.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/get_push.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/get_push.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/push.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/push.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/push.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/push.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/remove.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/remove.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/remove.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/remove.txt
diff --git a/examples/FirebaseSerialTerminal_ESP8266/set.txt b/contrib/examples/FirebaseSerialTerminal_ESP8266/set.txt
similarity index 100%
rename from examples/FirebaseSerialTerminal_ESP8266/set.txt
rename to contrib/examples/FirebaseSerialTerminal_ESP8266/set.txt
diff --git a/examples/Firething_ESP8266/Firething_ESP8266.ino b/contrib/examples/Firething_ESP8266/Firething_ESP8266.ino
similarity index 100%
rename from examples/Firething_ESP8266/Firething_ESP8266.ino
rename to contrib/examples/Firething_ESP8266/Firething_ESP8266.ino
diff --git a/hardware/firethings/firethings-kicad-libs/esp-12-smd.kicad_mod b/contrib/hardware/firethings/firethings-kicad-libs/esp-12-smd.kicad_mod
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/esp-12-smd.kicad_mod
rename to contrib/hardware/firethings/firethings-kicad-libs/esp-12-smd.kicad_mod
diff --git a/hardware/firethings/firethings-kicad-libs/esp-12.dcm b/contrib/hardware/firethings/firethings-kicad-libs/esp-12.dcm
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/esp-12.dcm
rename to contrib/hardware/firethings/firethings-kicad-libs/esp-12.dcm
diff --git a/hardware/firethings/firethings-kicad-libs/esp-12.lib b/contrib/hardware/firethings/firethings-kicad-libs/esp-12.lib
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/esp-12.lib
rename to contrib/hardware/firethings/firethings-kicad-libs/esp-12.lib
diff --git a/hardware/firethings/firethings-kicad-libs/firethings-logo.kicad_mod b/contrib/hardware/firethings/firethings-kicad-libs/firethings-logo.kicad_mod
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/firethings-logo.kicad_mod
rename to contrib/hardware/firethings/firethings-kicad-libs/firethings-logo.kicad_mod
diff --git a/hardware/firethings/firethings-kicad-libs/firethings-mini.kicad_mod b/contrib/hardware/firethings/firethings-kicad-libs/firethings-mini.kicad_mod
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/firethings-mini.kicad_mod
rename to contrib/hardware/firethings/firethings-kicad-libs/firethings-mini.kicad_mod
diff --git a/hardware/firethings/firethings-kicad-libs/firethings-mini.lib b/contrib/hardware/firethings/firethings-kicad-libs/firethings-mini.lib
similarity index 100%
rename from hardware/firethings/firethings-kicad-libs/firethings-mini.lib
rename to contrib/hardware/firethings/firethings-kicad-libs/firethings-mini.lib
diff --git a/hardware/firethings/ft1.3/back-3d.png b/contrib/hardware/firethings/ft1.3/back-3d.png
similarity index 100%
rename from hardware/firethings/ft1.3/back-3d.png
rename to contrib/hardware/firethings/ft1.3/back-3d.png
diff --git a/hardware/firethings/ft1.3/fab/raw-B.Cu.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-B.Cu.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-B.Cu.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-B.Cu.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-B.Mask.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-B.Mask.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-B.Mask.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-B.Mask.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-B.SilkS.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-B.SilkS.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-B.SilkS.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-B.SilkS.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-Edge.Cuts.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-Edge.Cuts.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-Edge.Cuts.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-Edge.Cuts.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-F.Cu.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-F.Cu.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-F.Cu.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-F.Cu.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-F.Mask.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-F.Mask.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-F.Mask.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-F.Mask.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-F.Paste.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-F.Paste.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-F.Paste.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-F.Paste.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw-F.SilkS.gbr b/contrib/hardware/firethings/ft1.3/fab/raw-F.SilkS.gbr
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw-F.SilkS.gbr
rename to contrib/hardware/firethings/ft1.3/fab/raw-F.SilkS.gbr
diff --git a/hardware/firethings/ft1.3/fab/raw.drl b/contrib/hardware/firethings/ft1.3/fab/raw.drl
similarity index 100%
rename from hardware/firethings/ft1.3/fab/raw.drl
rename to contrib/hardware/firethings/ft1.3/fab/raw.drl
diff --git a/hardware/firethings/ft1.3/fp-lib-table b/contrib/hardware/firethings/ft1.3/fp-lib-table
similarity index 100%
rename from hardware/firethings/ft1.3/fp-lib-table
rename to contrib/hardware/firethings/ft1.3/fp-lib-table
diff --git a/hardware/firethings/ft1.3/front-3d.png b/contrib/hardware/firethings/ft1.3/front-3d.png
similarity index 100%
rename from hardware/firethings/ft1.3/front-3d.png
rename to contrib/hardware/firethings/ft1.3/front-3d.png
diff --git a/hardware/firethings/ft1.3/raw-cache.lib b/contrib/hardware/firethings/ft1.3/raw-cache.lib
similarity index 100%
rename from hardware/firethings/ft1.3/raw-cache.lib
rename to contrib/hardware/firethings/ft1.3/raw-cache.lib
diff --git a/hardware/firethings/ft1.3/raw-gerbers1.3.zip b/contrib/hardware/firethings/ft1.3/raw-gerbers1.3.zip
similarity index 100%
rename from hardware/firethings/ft1.3/raw-gerbers1.3.zip
rename to contrib/hardware/firethings/ft1.3/raw-gerbers1.3.zip
diff --git a/hardware/firethings/ft1.3/raw-schematic.pdf b/contrib/hardware/firethings/ft1.3/raw-schematic.pdf
similarity index 100%
rename from hardware/firethings/ft1.3/raw-schematic.pdf
rename to contrib/hardware/firethings/ft1.3/raw-schematic.pdf
diff --git a/hardware/firethings/ft1.3/raw.bin b/contrib/hardware/firethings/ft1.3/raw.bin
similarity index 100%
rename from hardware/firethings/ft1.3/raw.bin
rename to contrib/hardware/firethings/ft1.3/raw.bin
diff --git a/hardware/firethings/ft1.3/raw.csv b/contrib/hardware/firethings/ft1.3/raw.csv
similarity index 100%
rename from hardware/firethings/ft1.3/raw.csv
rename to contrib/hardware/firethings/ft1.3/raw.csv
diff --git a/hardware/firethings/ft1.3/raw.dsn b/contrib/hardware/firethings/ft1.3/raw.dsn
similarity index 100%
rename from hardware/firethings/ft1.3/raw.dsn
rename to contrib/hardware/firethings/ft1.3/raw.dsn
diff --git a/hardware/firethings/ft1.3/raw.kicad_pcb b/contrib/hardware/firethings/ft1.3/raw.kicad_pcb
similarity index 100%
rename from hardware/firethings/ft1.3/raw.kicad_pcb
rename to contrib/hardware/firethings/ft1.3/raw.kicad_pcb
diff --git a/hardware/firethings/ft1.3/raw.net b/contrib/hardware/firethings/ft1.3/raw.net
similarity index 100%
rename from hardware/firethings/ft1.3/raw.net
rename to contrib/hardware/firethings/ft1.3/raw.net
diff --git a/hardware/firethings/ft1.3/raw.pro b/contrib/hardware/firethings/ft1.3/raw.pro
similarity index 100%
rename from hardware/firethings/ft1.3/raw.pro
rename to contrib/hardware/firethings/ft1.3/raw.pro
diff --git a/hardware/firethings/ft1.3/raw.rules b/contrib/hardware/firethings/ft1.3/raw.rules
similarity index 100%
rename from hardware/firethings/ft1.3/raw.rules
rename to contrib/hardware/firethings/ft1.3/raw.rules
diff --git a/hardware/firethings/ft1.3/raw.sch b/contrib/hardware/firethings/ft1.3/raw.sch
similarity index 100%
rename from hardware/firethings/ft1.3/raw.sch
rename to contrib/hardware/firethings/ft1.3/raw.sch
diff --git a/hardware/firethings/ft1.3/raw.ses b/contrib/hardware/firethings/ft1.3/raw.ses
similarity index 100%
rename from hardware/firethings/ft1.3/raw.ses
rename to contrib/hardware/firethings/ft1.3/raw.ses
diff --git a/src/SerialTransceiver.h b/contrib/src/SerialTransceiver.h
similarity index 100%
rename from src/SerialTransceiver.h
rename to contrib/src/SerialTransceiver.h
diff --git a/src/Thing.h b/contrib/src/Thing.h
similarity index 100%
rename from src/Thing.h
rename to contrib/src/Thing.h
diff --git a/src/modem/SerialProtocol.h b/contrib/src/modem/SerialProtocol.h
similarity index 100%
rename from src/modem/SerialProtocol.h
rename to contrib/src/modem/SerialProtocol.h
diff --git a/src/modem/SerialTransceiver.cpp b/contrib/src/modem/SerialTransceiver.cpp
similarity index 100%
rename from src/modem/SerialTransceiver.cpp
rename to contrib/src/modem/SerialTransceiver.cpp
diff --git a/src/modem/SerialTransceiver.h b/contrib/src/modem/SerialTransceiver.h
similarity index 100%
rename from src/modem/SerialTransceiver.h
rename to contrib/src/modem/SerialTransceiver.h
diff --git a/src/modem/command.h b/contrib/src/modem/command.h
similarity index 100%
rename from src/modem/command.h
rename to contrib/src/modem/command.h
diff --git a/src/modem/db/DatabaseProtocol.cpp b/contrib/src/modem/db/DatabaseProtocol.cpp
similarity index 100%
rename from src/modem/db/DatabaseProtocol.cpp
rename to contrib/src/modem/db/DatabaseProtocol.cpp
diff --git a/src/modem/db/DatabaseProtocol.h b/contrib/src/modem/db/DatabaseProtocol.h
similarity index 100%
rename from src/modem/db/DatabaseProtocol.h
rename to contrib/src/modem/db/DatabaseProtocol.h
diff --git a/src/modem/db/begin-command.cpp b/contrib/src/modem/db/begin-command.cpp
similarity index 100%
rename from src/modem/db/begin-command.cpp
rename to contrib/src/modem/db/begin-command.cpp
diff --git a/src/modem/db/commands.h b/contrib/src/modem/db/commands.h
similarity index 100%
rename from src/modem/db/commands.h
rename to contrib/src/modem/db/commands.h
diff --git a/src/modem/db/get-command.cpp b/contrib/src/modem/db/get-command.cpp
similarity index 100%
rename from src/modem/db/get-command.cpp
rename to contrib/src/modem/db/get-command.cpp
diff --git a/src/modem/db/push-command.cpp b/contrib/src/modem/db/push-command.cpp
similarity index 100%
rename from src/modem/db/push-command.cpp
rename to contrib/src/modem/db/push-command.cpp
diff --git a/src/modem/db/remove-command.cpp b/contrib/src/modem/db/remove-command.cpp
similarity index 100%
rename from src/modem/db/remove-command.cpp
rename to contrib/src/modem/db/remove-command.cpp
diff --git a/src/modem/db/set-command.cpp b/contrib/src/modem/db/set-command.cpp
similarity index 100%
rename from src/modem/db/set-command.cpp
rename to contrib/src/modem/db/set-command.cpp
diff --git a/src/modem/db/stream-command.cpp b/contrib/src/modem/db/stream-command.cpp
similarity index 100%
rename from src/modem/db/stream-command.cpp
rename to contrib/src/modem/db/stream-command.cpp
diff --git a/src/modem/design.md b/contrib/src/modem/design.md
similarity index 100%
rename from src/modem/design.md
rename to contrib/src/modem/design.md
diff --git a/src/modem/diagram.png b/contrib/src/modem/diagram.png
similarity index 100%
rename from src/modem/diagram.png
rename to contrib/src/modem/diagram.png
diff --git a/src/modem/input-stream.h b/contrib/src/modem/input-stream.h
similarity index 100%
rename from src/modem/input-stream.h
rename to contrib/src/modem/input-stream.h
diff --git a/src/modem/json_util.h b/contrib/src/modem/json_util.h
similarity index 100%
rename from src/modem/json_util.h
rename to contrib/src/modem/json_util.h
diff --git a/src/modem/output-stream.h b/contrib/src/modem/output-stream.h
similarity index 100%
rename from src/modem/output-stream.h
rename to contrib/src/modem/output-stream.h
diff --git a/serial_protocol.md b/contrib/src/modem/serial_protocol.md
similarity index 100%
rename from serial_protocol.md
rename to contrib/src/modem/serial_protocol.md
diff --git a/src/thing/Config.cpp b/contrib/src/thing/Config.cpp
similarity index 100%
rename from src/thing/Config.cpp
rename to contrib/src/thing/Config.cpp
diff --git a/src/thing/Config.h b/contrib/src/thing/Config.h
similarity index 100%
rename from src/thing/Config.h
rename to contrib/src/thing/Config.h
diff --git a/src/thing/FireThing.cpp b/contrib/src/thing/FireThing.cpp
similarity index 100%
rename from src/thing/FireThing.cpp
rename to contrib/src/thing/FireThing.cpp
diff --git a/src/thing/FireThing.h b/contrib/src/thing/FireThing.h
similarity index 100%
rename from src/thing/FireThing.h
rename to contrib/src/thing/FireThing.h
diff --git a/src/thing/Portal.cpp b/contrib/src/thing/Portal.cpp
similarity index 100%
rename from src/thing/Portal.cpp
rename to contrib/src/thing/Portal.cpp
diff --git a/src/thing/Portal.h b/contrib/src/thing/Portal.h
similarity index 100%
rename from src/thing/Portal.h
rename to contrib/src/thing/Portal.h
diff --git a/src/thing/Transcriber.cpp b/contrib/src/thing/Transcriber.cpp
similarity index 100%
rename from src/thing/Transcriber.cpp
rename to contrib/src/thing/Transcriber.cpp
diff --git a/src/thing/Transcriber.h b/contrib/src/thing/Transcriber.h
similarity index 100%
rename from src/thing/Transcriber.h
rename to contrib/src/thing/Transcriber.h
diff --git a/src/thing/WiFiManager.cpp b/contrib/src/thing/WiFiManager.cpp
similarity index 100%
rename from src/thing/WiFiManager.cpp
rename to contrib/src/thing/WiFiManager.cpp
diff --git a/src/thing/WiFiManager.h b/contrib/src/thing/WiFiManager.h
similarity index 100%
rename from src/thing/WiFiManager.h
rename to contrib/src/thing/WiFiManager.h
diff --git a/test/FirebaseArduino_test.cpp b/contrib/test/FirebaseArduino_test.cpp
similarity index 100%
rename from test/FirebaseArduino_test.cpp
rename to contrib/test/FirebaseArduino_test.cpp
diff --git a/test/Makefile b/contrib/test/Makefile
similarity index 84%
rename from test/Makefile
rename to contrib/test/Makefile
index 8c2e8a9e..71f5f589 100644
--- a/test/Makefile
+++ b/contrib/test/Makefile
@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
-FIREBASE_DIR=..
+FIREBASE_DIR=../..
 GTEST_DIR=googletest/googletest
-ARDUINOJSON_DIR=../src/third-party/arduino-json-5.6.7
+ARDUINOJSON_DIR=../../src/third-party/arduino-json-5.6.7
 
 FIREBASE_SRCS=${FIREBASE_DIR}/src/FirebaseObject.cpp
 GTEST_SRCS=${GTEST_DIR}/src/gtest-all.cpp
@@ -27,7 +27,7 @@ SRCS=FirebaseArduino_test.cpp\
 
 OBJS=${SRCS:.cpp=.o}
 
-CXXFLAGS=-I. -I../src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g
+CXXFLAGS=-I. -I${FIREBASE_DIR}/src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g
 LDFLAGS=-lpthread
 
 all: check
diff --git a/test/WString.h b/contrib/test/WString.h
similarity index 100%
rename from test/WString.h
rename to contrib/test/WString.h
diff --git a/contrib/test/arduino-mock b/contrib/test/arduino-mock
new file mode 160000
index 00000000..0f7f9fa2
--- /dev/null
+++ b/contrib/test/arduino-mock
@@ -0,0 +1 @@
+Subproject commit 0f7f9fa2cea822edf7b11099110b3e0fdb895a53
diff --git a/test/dummies/ESP8266HTTPClient.h b/contrib/test/dummies/ESP8266HTTPClient.h
similarity index 100%
rename from test/dummies/ESP8266HTTPClient.h
rename to contrib/test/dummies/ESP8266HTTPClient.h
diff --git a/test/dummies/FirebaseHttpClient_dummy.cpp b/contrib/test/dummies/FirebaseHttpClient_dummy.cpp
similarity index 100%
rename from test/dummies/FirebaseHttpClient_dummy.cpp
rename to contrib/test/dummies/FirebaseHttpClient_dummy.cpp
diff --git a/test/dummies/Stream.h b/contrib/test/dummies/Stream.h
similarity index 100%
rename from test/dummies/Stream.h
rename to contrib/test/dummies/Stream.h
diff --git a/test/dummies/WString.h b/contrib/test/dummies/WString.h
similarity index 100%
rename from test/dummies/WString.h
rename to contrib/test/dummies/WString.h
diff --git a/contrib/test/googletest b/contrib/test/googletest
new file mode 160000
index 00000000..a2b8a8e0
--- /dev/null
+++ b/contrib/test/googletest
@@ -0,0 +1 @@
+Subproject commit a2b8a8e07628e5fd60644b6dd99c1b5e7d7f1f47
diff --git a/test/mock-firebase.h b/contrib/test/mock-firebase.h
similarity index 100%
rename from test/mock-firebase.h
rename to contrib/test/mock-firebase.h
diff --git a/test/modem/Makefile b/contrib/test/modem/Makefile
similarity index 97%
rename from test/modem/Makefile
rename to contrib/test/modem/Makefile
index 2776b63a..a8e15853 100644
--- a/test/modem/Makefile
+++ b/contrib/test/modem/Makefile
@@ -30,8 +30,10 @@ ARDUINO_MOCK_DIR = ../arduino-mock/
 # Where to find user code.
 TEST_DIR = .
 
-PROJECT_ROOT = ../../
+FIREBASE_ROOT = ../../..
+PROJECT_ROOT = ../..
 SRC_ROOT = $(PROJECT_ROOT)/src
+FIREBASE_SRC_ROOT = $(FIREBASE_ROOT)/src
 
 # Flags passed to the preprocessor.
 # Set Google Test and Google Mock's header directories as system
@@ -42,6 +44,7 @@ CPPFLAGS += -isystem $(GTEST_DIR)/include -isystem $(GMOCK_DIR)/include \
 		-I$(ARDUINO_MOCK_DIR)/include/ \
 		-I$(PROJECT_ROOT)/test/dummies \
 		-I$(PROJECT_ROOT)/src \
+		-I$(FIREBASE_ROOT)/src \
 		-I$(PROJECT_ROOT)
 
 # Flags passed to the C++ compiler.
@@ -125,8 +128,8 @@ arduino_mock_all.a : ArduinoMockAll.o
 
 # Builds shared objects.
 
-Firebase.o : $(SRC_ROOT)/Firebase.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(SRC_ROOT)/Firebase.cpp
+Firebase.o : $(FIREBASE_SRC_ROOT)/Firebase.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(FIREBASE_SRC_ROOT)/Firebase.cpp
 
 FirebaseHttpClient_dummy.o : $(PROJECT_ROOT)/test/dummies/FirebaseHttpClient_dummy.cpp
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(PROJECT_ROOT)/test/dummies/FirebaseHttpClient_dummy.cpp
diff --git a/test/modem/begin-command_test.cpp b/contrib/test/modem/begin-command_test.cpp
similarity index 100%
rename from test/modem/begin-command_test.cpp
rename to contrib/test/modem/begin-command_test.cpp
diff --git a/test/modem/get-command_test.cpp b/contrib/test/modem/get-command_test.cpp
similarity index 100%
rename from test/modem/get-command_test.cpp
rename to contrib/test/modem/get-command_test.cpp
diff --git a/test/modem/mock-input-stream.h b/contrib/test/modem/mock-input-stream.h
similarity index 100%
rename from test/modem/mock-input-stream.h
rename to contrib/test/modem/mock-input-stream.h
diff --git a/test/modem/mock-output-stream.h b/contrib/test/modem/mock-output-stream.h
similarity index 100%
rename from test/modem/mock-output-stream.h
rename to contrib/test/modem/mock-output-stream.h
diff --git a/test/modem/push-command_test.cpp b/contrib/test/modem/push-command_test.cpp
similarity index 100%
rename from test/modem/push-command_test.cpp
rename to contrib/test/modem/push-command_test.cpp
diff --git a/test/modem/remove-command_test.cpp b/contrib/test/modem/remove-command_test.cpp
similarity index 100%
rename from test/modem/remove-command_test.cpp
rename to contrib/test/modem/remove-command_test.cpp
diff --git a/test/modem/serial-transceiver_test.cpp b/contrib/test/modem/serial-transceiver_test.cpp
similarity index 100%
rename from test/modem/serial-transceiver_test.cpp
rename to contrib/test/modem/serial-transceiver_test.cpp
diff --git a/test/modem/set-command_test.cpp b/contrib/test/modem/set-command_test.cpp
similarity index 100%
rename from test/modem/set-command_test.cpp
rename to contrib/test/modem/set-command_test.cpp
diff --git a/test/modem/stream-command_test.cpp b/contrib/test/modem/stream-command_test.cpp
similarity index 100%
rename from test/modem/stream-command_test.cpp
rename to contrib/test/modem/stream-command_test.cpp
diff --git a/test/travis/check_all_examples_use_standard_init.sh b/contrib/test/travis/check_all_examples_use_standard_init.sh
similarity index 50%
rename from test/travis/check_all_examples_use_standard_init.sh
rename to contrib/test/travis/check_all_examples_use_standard_init.sh
index 82a2270e..d1fe0e4b 100755
--- a/test/travis/check_all_examples_use_standard_init.sh
+++ b/contrib/test/travis/check_all_examples_use_standard_init.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-FBASE_SNIPPET=test/travis/firebase_init.cc.snip
-FBASE_NOAUTH_SNIPPET=test/travis/no_firebase_init.cc.snip
-FBASE_NOCONFIG_SNIPPET=test/travis/no_config_init.cc.snip
-for example in `find examples/ -name *.ino`;
+FBASE_SNIPPET=contrib/test/travis/firebase_init.cc.snip
+FBASE_NOAUTH_SNIPPET=contrib/test/travis/no_firebase_init.cc.snip
+FBASE_NOCONFIG_SNIPPET=contrib/test/travis/no_config_init.cc.snip
+for example in `find examples/ contrib/examples/ -name *.ino`;
 do
   echo $example;
   (xxd -p $example | tr -d '\n' | grep -q `xxd -p $FBASE_SNIPPET | tr -d '\n'`) ||
@@ -10,7 +10,7 @@ do
   (xxd -p $example | tr -d '\n' | grep -q `xxd -p $FBASE_NOCONFIG_SNIPPET | tr -d '\n'`) ||
   if [ $? -ne 0 ];
   then
-    echo $example does not contain standard defined in test/travis/*_init.cc.snip.
+    echo $example does not contain standard defined in contrib/test/travis/*_init.cc.snip.
     exit 1;
   fi;
 done;
diff --git a/test/travis/firebase_init.cc.snip b/contrib/test/travis/firebase_init.cc.snip
similarity index 100%
rename from test/travis/firebase_init.cc.snip
rename to contrib/test/travis/firebase_init.cc.snip
diff --git a/test/travis/no_config_init.cc.snip b/contrib/test/travis/no_config_init.cc.snip
similarity index 100%
rename from test/travis/no_config_init.cc.snip
rename to contrib/test/travis/no_config_init.cc.snip
diff --git a/test/travis/no_firebase_init.cc.snip b/contrib/test/travis/no_firebase_init.cc.snip
similarity index 100%
rename from test/travis/no_firebase_init.cc.snip
rename to contrib/test/travis/no_firebase_init.cc.snip
diff --git a/test/arduino-mock b/test/arduino-mock
deleted file mode 160000
index ff0f896a..00000000
--- a/test/arduino-mock
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff0f896a815df02c08bcd7d99168cd3bcbf05b1a
diff --git a/test/googletest b/test/googletest
deleted file mode 160000
index ff07a5de..00000000
--- a/test/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff07a5de0e81580547f1685e101194ed1a4fcd56