renamed controllers and organized new app