Move more Direction stuff into Direction module