Move files to sub-directory
Move into importable module
Fix reference to license
Make tests more package-friendly
Fix up the error logic
Make more package-friendly