proper names for modules
removed codegeneration part