changes to file organization