Reorganized script files