PSR-4

As promised ;)