diff --git a/pom.xml b/pom.xml
index b2b991c..a1d4532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
                 </executions>
                     <configuration>
                             <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                            <protoSourceRoot>${project.basedir}/uprotocol</protoSourceRoot>
                     </configuration>
             </plugin>                 
 
diff --git a/src/main/proto/README.adoc b/uprotocol/README.adoc
similarity index 100%
rename from src/main/proto/README.adoc
rename to uprotocol/README.adoc
diff --git a/src/main/proto/core/README.adoc b/uprotocol/core/README.adoc
similarity index 100%
rename from src/main/proto/core/README.adoc
rename to uprotocol/core/README.adoc
diff --git a/src/main/proto/core/udiscovery/v3/udiscovery.proto b/uprotocol/core/udiscovery/v3/udiscovery.proto
similarity index 100%
rename from src/main/proto/core/udiscovery/v3/udiscovery.proto
rename to uprotocol/core/udiscovery/v3/udiscovery.proto
diff --git a/src/main/proto/core/usubscription/v3/usubscription.proto b/uprotocol/core/usubscription/v3/usubscription.proto
similarity index 100%
rename from src/main/proto/core/usubscription/v3/usubscription.proto
rename to uprotocol/core/usubscription/v3/usubscription.proto
diff --git a/src/main/proto/core/utwin/v1/utwin.proto b/uprotocol/core/utwin/v1/utwin.proto
similarity index 100%
rename from src/main/proto/core/utwin/v1/utwin.proto
rename to uprotocol/core/utwin/v1/utwin.proto
diff --git a/src/main/proto/file.proto b/uprotocol/file.proto
similarity index 100%
rename from src/main/proto/file.proto
rename to uprotocol/file.proto
diff --git a/src/main/proto/uattributes.proto b/uprotocol/uattributes.proto
similarity index 99%
rename from src/main/proto/uattributes.proto
rename to uprotocol/uattributes.proto
index 6986f2e..29811a1 100644
--- a/src/main/proto/uattributes.proto
+++ b/uprotocol/uattributes.proto
@@ -65,7 +65,7 @@ message UAttributes {
     // Communication error attribute populated by uP-L2 dispatchers only when an error 
     // has occurred in the delivery of RPC request or response events. 
     // The contents of this attribute, if present, is the unsigned integer representation of
-    // google.rpc.Code
+    // UCode
     optional int32 commstatus = 7;
 
     // The correlation ID (UUDI) passed for response type messages to corelate the 
diff --git a/src/main/proto/umessage.proto b/uprotocol/umessage.proto
similarity index 100%
rename from src/main/proto/umessage.proto
rename to uprotocol/umessage.proto
diff --git a/src/main/proto/upayload.proto b/uprotocol/upayload.proto
similarity index 100%
rename from src/main/proto/upayload.proto
rename to uprotocol/upayload.proto
diff --git a/src/main/proto/uprotocol_options.proto b/uprotocol/uprotocol_options.proto
similarity index 100%
rename from src/main/proto/uprotocol_options.proto
rename to uprotocol/uprotocol_options.proto
diff --git a/src/main/proto/uri.proto b/uprotocol/uri.proto
similarity index 100%
rename from src/main/proto/uri.proto
rename to uprotocol/uri.proto
diff --git a/src/main/proto/ustatus.proto b/uprotocol/ustatus.proto
similarity index 100%
rename from src/main/proto/ustatus.proto
rename to uprotocol/ustatus.proto
diff --git a/src/main/proto/uuid.proto b/uprotocol/uuid.proto
similarity index 100%
rename from src/main/proto/uuid.proto
rename to uprotocol/uuid.proto