Reorganized analysis scripts