Altered file structure to conform to new spec