diff --git a/N64Controller/library.properties b/library.properties
similarity index 85%
rename from N64Controller/library.properties
rename to library.properties
index 97cfc1a..88deb0a 100644
--- a/N64Controller/library.properties
+++ b/library.properties
@@ -1,7 +1,7 @@
 name=N64Controller
 version=0.1
 author=Andrew Brown, Peter Den Hartog, Kai Lüke, Daniel Schaal
-maintainer=Daniel Schaal <daniel@schaal.email>
+maintainer=Kai Lüke <kailueke@riseup.net>
 sentence=Arduino library to connect a N64 controller.
 paragraph=
 category=Device Control
diff --git a/N64Controller/src/N64Controller.cpp b/src/N64Controller.cpp
similarity index 100%
rename from N64Controller/src/N64Controller.cpp
rename to src/N64Controller.cpp
diff --git a/N64Controller/src/N64Controller.h b/src/N64Controller.h
similarity index 100%
rename from N64Controller/src/N64Controller.h
rename to src/N64Controller.h
diff --git a/N64Controller/src/N64Interface.cpp b/src/N64Interface.cpp
similarity index 100%
rename from N64Controller/src/N64Interface.cpp
rename to src/N64Interface.cpp
diff --git a/N64Controller/src/N64Interface.h b/src/N64Interface.h
similarity index 100%
rename from N64Controller/src/N64Interface.h
rename to src/N64Interface.h