move file stuff out of json
Merge pull request #1531 from WalterBright/b26

move file stuff out of json