A big refactor for adm angular