Reorganizing admin framework