file organization, entry design updates