refactor MX/Modules