diff --git a/driver/.gitignore b/driver/linux/.gitignore
similarity index 100%
rename from driver/.gitignore
rename to driver/linux/.gitignore
diff --git a/driver/Makefile b/driver/linux/Makefile
similarity index 100%
rename from driver/Makefile
rename to driver/linux/Makefile
diff --git a/driver/panda.c b/driver/linux/panda.c
similarity index 99%
rename from driver/panda.c
rename to driver/linux/panda.c
index e67d81ca0..65f25d479 100644
--- a/driver/panda.c
+++ b/driver/linux/panda.c
@@ -1,6 +1,6 @@
 /**
  * @file    panda.c
- * @author  Jeddy Diamond Exum
+ * @author  Jessy Diamond Exum
  * @date    16 June 2017
  * @version 0.1
  * @brief   Driver for the Comma.ai Panda CAN adapter to allow it to be controlled via
diff --git a/driver_test/Makefile b/driver/linux/test/Makefile
similarity index 100%
rename from driver_test/Makefile
rename to driver/linux/test/Makefile
diff --git a/driver_test/main.c b/driver/linux/test/main.c
similarity index 100%
rename from driver_test/main.c
rename to driver/linux/test/main.c
diff --git a/driver_test/run.sh b/driver/linux/test/run.sh
similarity index 100%
rename from driver_test/run.sh
rename to driver/linux/test/run.sh