Controller & Mapper references set, index.php refactored