PSR 4

I've updated the code to use PSR-4