Refactored modules definitions.