angular code restructure
angular code restructure and refactoring