-- small refactor.
-- add LocationProto, WorldProto.