Add back in datafiles and datadirs to cleaned up schema.