Angular restructure