Refactor of angular  modules dependence