Refactored angular modules.