Simplify the structure of the project by removing the angular indirection