Extracted module creation out of the class creation