change the file name structure for output
fiddling about with some classes etc