PSR-4

- Updates package structure to use PSR-4
Merge branch 'hotfix/psr-4'

Close #128