Feature location

Updating namespace of protobuf files, location fixing.