Refactoring modules for clarity