Moved a bunch of paths around.