refs #307 modifications to the file structures