Clean up code / Refactorings
Merge pull request #4 from ariejan/issue_4_code_cleanup

Proper Golang packaging