Refactor to standard go package
Merge commit 'pull/1'

This should get the project tree into a more easily consumed form.