Renamed View modules and ViewControllers properly