Rename/Move things to make it easier to overview and read.