Cleanup and reordering of files.