RFR Add admin role

Use nested module/class definitions instead of compact style.