New folder structure adds duplication and potential confusion - there should ideally be One True Source of each script in the repo.