more clean-ups (moved/renamed Message_pb2 to message)