RFR - added admin functionality

Use nested module/class definitions instead of compact style.