refactoring, cleanup, admin module added 

refactoring, cleanup, admin module added