restructure angular