Moved paths around a bit.