Abstracted angular code into separate modules