Refactoring of the Constructor into multiple modules.