reorganize a few files