Reorganized scripts and script directories