reorganizing controllers and views