Rearrange directory structure a bit.