Reorganizng admin controllers after some successful experiments