Modules reorganization