sort files into directories, tidy things up a bit
more tidying up
correctly escape dollar signs in SQL
update config files for _Disk nodes, tidy them up a bit