Changed main file and scripts to reflect reorganized modules.