Rearrange some parts to make routing easier.