Refactoring modules and adding modules to remote requests