Rearrange which functions go in which files.