Move things around

Just for neatness