Reorganized scripts again