Package organization
Merge pull request #17 from william-alexander/master

Package organization
Remove Eclipse-error-causing things
Merge pull request #18 from william-alexander/master

Remove Eclipse-error-causing things