reorganized data/scripts