refactor admin bundle