Modules architecture

diag f5016d1c8cb32bf8872e74d98d8dd7f1