Moved paths around again

Backwards incompatible