diff --git a/reefnet_sensuspro_test.c b/examples/reefnet_sensuspro_test.c
similarity index 100%
rename from reefnet_sensuspro_test.c
rename to examples/reefnet_sensuspro_test.c
diff --git a/reefnet_sensusultra_test.c b/examples/reefnet_sensusultra_test.c
similarity index 100%
rename from reefnet_sensusultra_test.c
rename to examples/reefnet_sensusultra_test.c
diff --git a/suunto_d9_test.c b/examples/suunto_d9_test.c
similarity index 100%
rename from suunto_d9_test.c
rename to examples/suunto_d9_test.c
diff --git a/suunto_eon_test.c b/examples/suunto_eon_test.c
similarity index 100%
rename from suunto_eon_test.c
rename to examples/suunto_eon_test.c
diff --git a/suunto_vyper2_test.c b/examples/suunto_vyper2_test.c
similarity index 100%
rename from suunto_vyper2_test.c
rename to examples/suunto_vyper2_test.c
diff --git a/suunto_vyper_test.c b/examples/suunto_vyper_test.c
similarity index 100%
rename from suunto_vyper_test.c
rename to examples/suunto_vyper_test.c
diff --git a/uwatec_aladin_test.c b/examples/uwatec_aladin_test.c
similarity index 100%
rename from uwatec_aladin_test.c
rename to examples/uwatec_aladin_test.c
diff --git a/uwatec_memomouse_test.c b/examples/uwatec_memomouse_test.c
similarity index 100%
rename from uwatec_memomouse_test.c
rename to examples/uwatec_memomouse_test.c
diff --git a/uwatec_smart_test.c b/examples/uwatec_smart_test.c
similarity index 100%
rename from uwatec_smart_test.c
rename to examples/uwatec_smart_test.c
diff --git a/irda.c b/src/irda.c
similarity index 100%
rename from irda.c
rename to src/irda.c
diff --git a/irda.h b/src/irda.h
similarity index 100%
rename from irda.h
rename to src/irda.h
diff --git a/reefnet.h b/src/reefnet.h
similarity index 100%
rename from reefnet.h
rename to src/reefnet.h
diff --git a/reefnet_sensuspro.c b/src/reefnet_sensuspro.c
similarity index 100%
rename from reefnet_sensuspro.c
rename to src/reefnet_sensuspro.c
diff --git a/reefnet_sensuspro.h b/src/reefnet_sensuspro.h
similarity index 100%
rename from reefnet_sensuspro.h
rename to src/reefnet_sensuspro.h
diff --git a/reefnet_sensusultra.c b/src/reefnet_sensusultra.c
similarity index 100%
rename from reefnet_sensusultra.c
rename to src/reefnet_sensusultra.c
diff --git a/reefnet_sensusultra.h b/src/reefnet_sensusultra.h
similarity index 100%
rename from reefnet_sensusultra.h
rename to src/reefnet_sensusultra.h
diff --git a/serial.h b/src/serial.h
similarity index 100%
rename from serial.h
rename to src/serial.h
diff --git a/serial_posix.c b/src/serial_posix.c
similarity index 100%
rename from serial_posix.c
rename to src/serial_posix.c
diff --git a/serial_win32.c b/src/serial_win32.c
similarity index 100%
rename from serial_win32.c
rename to src/serial_win32.c
diff --git a/suunto.h b/src/suunto.h
similarity index 100%
rename from suunto.h
rename to src/suunto.h
diff --git a/suunto_common.c b/src/suunto_common.c
similarity index 100%
rename from suunto_common.c
rename to src/suunto_common.c
diff --git a/suunto_common.h b/src/suunto_common.h
similarity index 100%
rename from suunto_common.h
rename to src/suunto_common.h
diff --git a/suunto_d9.c b/src/suunto_d9.c
similarity index 100%
rename from suunto_d9.c
rename to src/suunto_d9.c
diff --git a/suunto_d9.h b/src/suunto_d9.h
similarity index 100%
rename from suunto_d9.h
rename to src/suunto_d9.h
diff --git a/suunto_eon.c b/src/suunto_eon.c
similarity index 100%
rename from suunto_eon.c
rename to src/suunto_eon.c
diff --git a/suunto_eon.h b/src/suunto_eon.h
similarity index 100%
rename from suunto_eon.h
rename to src/suunto_eon.h
diff --git a/suunto_vyper.c b/src/suunto_vyper.c
similarity index 100%
rename from suunto_vyper.c
rename to src/suunto_vyper.c
diff --git a/suunto_vyper.h b/src/suunto_vyper.h
similarity index 100%
rename from suunto_vyper.h
rename to src/suunto_vyper.h
diff --git a/suunto_vyper2.c b/src/suunto_vyper2.c
similarity index 100%
rename from suunto_vyper2.c
rename to src/suunto_vyper2.c
diff --git a/suunto_vyper2.h b/src/suunto_vyper2.h
similarity index 100%
rename from suunto_vyper2.h
rename to src/suunto_vyper2.h
diff --git a/utils.c b/src/utils.c
similarity index 100%
rename from utils.c
rename to src/utils.c
diff --git a/utils.h b/src/utils.h
similarity index 100%
rename from utils.h
rename to src/utils.h
diff --git a/uwatec.h b/src/uwatec.h
similarity index 100%
rename from uwatec.h
rename to src/uwatec.h
diff --git a/uwatec_aladin.c b/src/uwatec_aladin.c
similarity index 100%
rename from uwatec_aladin.c
rename to src/uwatec_aladin.c
diff --git a/uwatec_aladin.h b/src/uwatec_aladin.h
similarity index 100%
rename from uwatec_aladin.h
rename to src/uwatec_aladin.h
diff --git a/uwatec_memomouse.c b/src/uwatec_memomouse.c
similarity index 100%
rename from uwatec_memomouse.c
rename to src/uwatec_memomouse.c
diff --git a/uwatec_memomouse.h b/src/uwatec_memomouse.h
similarity index 100%
rename from uwatec_memomouse.h
rename to src/uwatec_memomouse.h
diff --git a/uwatec_smart.c b/src/uwatec_smart.c
similarity index 100%
rename from uwatec_smart.c
rename to src/uwatec_smart.c
diff --git a/uwatec_smart.h b/src/uwatec_smart.h
similarity index 100%
rename from uwatec_smart.h
rename to src/uwatec_smart.h