Refactor to create angular modules