diff --git a/N64Controller/library.properties b/N64Controller/library.properties
new file mode 100644
index 0000000..a75fc97
--- /dev/null
+++ b/N64Controller/library.properties
@@ -0,0 +1,10 @@
+name=N64Controller
+version=0.1
+author=Andrew Brown, Peter Den Hartog, Kai Lüke, Daniel Schaal
+maintainer=Daniel Schaal <daniel@schaal.email>
+sentence=Arduino library to connect a N64 controller.
+paragraph=
+category=Device Control
+includes=N64Controller.h
+url=https://github.com/schaal/n64controller
+architectures=avr
diff --git a/N64Controller/N64Controller.cpp b/N64Controller/src/N64Controller.cpp
similarity index 100%
rename from N64Controller/N64Controller.cpp
rename to N64Controller/src/N64Controller.cpp
diff --git a/N64Controller/N64Controller.h b/N64Controller/src/N64Controller.h
similarity index 100%
rename from N64Controller/N64Controller.h
rename to N64Controller/src/N64Controller.h
diff --git a/N64Controller/N64Interface.cpp b/N64Controller/src/N64Interface.cpp
similarity index 100%
rename from N64Controller/N64Interface.cpp
rename to N64Controller/src/N64Interface.cpp
diff --git a/N64Controller/N64Interface.h b/N64Controller/src/N64Interface.h
similarity index 100%
rename from N64Controller/N64Interface.h
rename to N64Controller/src/N64Interface.h