Move shortpath.h to a more suitable location