reorganize stuff a bit