Changed from PSR0 to PSR4