Controller / view restructuring
code restructuring