3.0 admin restructuring