moving around some stuff to more meaningful paths