Fixed PSR-4 stuff and tested different locations for Controllers