Extract command module, rename script