[task] refactor to new self administration location
[task] refactoring for seld administration
[task] fixed tests for internal logic change in self admin
Merge pull request #121 from dacrome/refactoring-for-self-admin

[task] refactoring for self administration