Modify Angular Architecture