Reorganized scripts