changed output file names, some more polishing/streamlining to scripts
renamed a bunch of files. Hopefully git's still tracking them well