[build] Move around some stuff to shorten paths