some structure fix and refactore of admin module ans services