refactoring code

naming controllers
grouping items
etc...