Refactoring, organizing with ui-router