Merge more file configuration functionality into new fileconfig class