Refactor/top level angular rebased