remove some commented out code
move filenames into config structure
commandline options to change filenames, to support multiple use in one directory