Switch over to new file format

Old code still retained
Remove old code for old file format