diff --git a/LICENSE b/extras/LICENSE
similarity index 100%
rename from LICENSE
rename to extras/LICENSE
diff --git a/library.properties b/library.properties
new file mode 100644
index 0000000..e0de09b
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,10 @@
+name=HamShield
+version=1.0.2
+author=Morgan Redfield <morgan@enhancedradio.com>, Casey Halverson <casey@enhancedradio.com>
+maintainer=Morgan Redfield <morgan@enhancedradio.com>
+sentence=A library for use with HamShield by Enhanced Radio Devices.
+paragraph=
+category=Device Control
+url=http://www.hamshield.com
+architectures=*
+includes=HamShield.h
\ No newline at end of file
diff --git a/HamShield.cpp b/src/HamShield.cpp
similarity index 100%
rename from HamShield.cpp
rename to src/HamShield.cpp
diff --git a/HamShield.h b/src/HamShield.h
similarity index 100%
rename from HamShield.h
rename to src/HamShield.h
diff --git a/HamShield_comms.cpp b/src/HamShield_comms.cpp
similarity index 100%
rename from HamShield_comms.cpp
rename to src/HamShield_comms.cpp
diff --git a/HamShield_comms.h b/src/HamShield_comms.h
similarity index 100%
rename from HamShield_comms.h
rename to src/HamShield_comms.h
diff --git a/SimpleFIFO.h b/src/SimpleFIFO.h
similarity index 100%
rename from SimpleFIFO.h
rename to src/SimpleFIFO.h
diff --git a/inProgress/AFSK.cpp b/src/inProgress/AFSK.cpp
similarity index 100%
rename from inProgress/AFSK.cpp
rename to src/inProgress/AFSK.cpp
diff --git a/inProgress/AFSK.h b/src/inProgress/AFSK.h
similarity index 100%
rename from inProgress/AFSK.h
rename to src/inProgress/AFSK.h
diff --git a/inProgress/DDS.cpp b/src/inProgress/DDS.cpp
similarity index 100%
rename from inProgress/DDS.cpp
rename to src/inProgress/DDS.cpp
diff --git a/inProgress/DDS.h b/src/inProgress/DDS.h
similarity index 100%
rename from inProgress/DDS.h
rename to src/inProgress/DDS.h
diff --git a/inProgress/KISS.cpp b/src/inProgress/KISS.cpp
similarity index 100%
rename from inProgress/KISS.cpp
rename to src/inProgress/KISS.cpp
diff --git a/inProgress/KISS.h b/src/inProgress/KISS.h
similarity index 100%
rename from inProgress/KISS.h
rename to src/inProgress/KISS.h