Updated and reorganized scripts