refactoring, admin states, directive tests, config