[enhancement] refactoring admin done w directives (close #58)