Moving things around so less stuff is broken after installation