Use PSR-4
Merge pull request #291 from Tobion/psr-4

Use PSR-4