Reorganized Angular-Ui-Router
Code reorganization