diff --git a/.gitignore b/.gitignore
index cdbd978..51f9749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
 [._]s[a-w][a-z]
 *.un~
 Session.vim
+.development
 .netrwhist
 *~
diff --git a/.travis.yml b/.travis.yml
index 091f37f..f956021 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,15 @@ install:
   - ln -s $PWD $HOME/arduino_ide/libraries/MemoryFree
   - export PATH="$HOME/arduino_ide:$PATH"
   - arduino --pref "boardsmanager.additional.urls=https://adafruit.github.io/arduino-board-index/package_adafruit_index.json,http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs 2>&1
-  - arduino --install-boards arduino:sam 2>&1 /dev/null
-  - arduino --install-boards arduino:samd 2>&1 /dev/null
-  - arduino --install-boards esp8266:esp8266 2>&1 /dev/null
-  - arduino --install-boards adafruit:avr 2>&1 /dev/null
-  - arduino --install-library TinyWireM 2>&1
+  - arduino --install-boards arduino:sam 2>&1
+  - arduino --install-boards arduino:samd 2>&1
+  - arduino --install-boards esp8266:esp8266 2>&1
+  - arduino --install-boards adafruit:avr 2>&1
   - arduino --pref "compiler.warning_level=all" --save-prefs
 script:
   - arduino --verify --board arduino:avr:uno $PWD/examples/FreeMemory/FreeMemory.ino
   - arduino --verify --board arduino:sam:arduino_due_x $PWD/examples/FreeMemory/FreeMemory.ino
-  - arduino --verify --board arduino:samd:zero $PWD/examples/FreeMemory/FreeMemory.ino
+  - arduino --verify --board arduino:samd:arduino_zero_edbg $PWD/examples/FreeMemory/FreeMemory.ino
   - arduino --verify --board esp8266:esp8266:huzzah $PWD/examples/FreeMemory/FreeMemory.ino
   - arduino --verify --board arduino:avr:leonardo $PWD/examples/FreeMemory/FreeMemory.ino
   - arduino --verify --board adafruit:avr:trinket5 $PWD/examples/FreeMemory/FreeMemory.ino
diff --git a/keywords.txt b/keywords.txt
new file mode 100644
index 0000000..ccea7b3
--- /dev/null
+++ b/keywords.txt
@@ -0,0 +1 @@
+freeMemory	KEYWORD2
diff --git a/library.properties b/library.properties
new file mode 100644
index 0000000..9ae5378
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,9 @@
+name=MemoryFree
+version=1.0.0
+author=Various; see https://forum.arduino.cc/index.php?topic=27536.0
+maintainer=Neil McNeight (http://mcneight.org/)
+sentence=Functions for calculating amount for free data memory (RAM).
+paragraph=This library contains functions for calculating the amount for free data memory (RAM) available, based on factors such as the top of heap, stack size and the size of the free list.
+category=Other
+url=https://github.com/McNeight/MemoryFree
+architectures=*
diff --git a/MemoryFree.cpp b/src/MemoryFree.cpp
similarity index 100%
rename from MemoryFree.cpp
rename to src/MemoryFree.cpp
diff --git a/MemoryFree.h b/src/MemoryFree.h
similarity index 100%
rename from MemoryFree.h
rename to src/MemoryFree.h