Renaming controllers module, cleaning views and adding current city on scope