[ARCH] 'Modules refactoring'