[REFACTOR] Further integration of moduleTypes