cleaned more code, reorganized script files in folder