Updated to PSR-4 because PSR-0 is now deprecated on composer