Issue #520: Simpler access rights configuration
Reorganized the modules