Added autoloading
Renamed controllers for autoloading