Changed file structure for outputed files