[TIMOB-10752] Lots more work on module create.