Start using PSR-4
Fix indentation in test - it was bugging me