reorganized the script and module names