[TIMOB-10752] More work on the module creation stuff.