Updates to file organization.