Refactor admin module