SQL script updates

Consolidated most scripts into just a couple for applying to TEST01, and
put old versions into 'individual bits' subfolder(s)