ENH: Reorganized scripts