adopt angular, server refactor