refactored(modules): rename folders with submodules to modules