Refactoring of the angular architecture