moved some paths around