Refactoring nav system classes
Integrating RBAC class tree