Merge "Refactored ModuleBuilder to avoid name conflicts. Fixed implementation of...