#334: Restructure JSON 'file properties' structure

Resolves #334.