Moved a few files around to make search paths simpler.