reorganize a couple things