Refactored submodules