diff --git a/.gitignore b/.gitignore
index 24ff3b7fd64..cab916ab122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,9 +186,9 @@ dpf-standalone/
 search/
 
 # ansys-dpf-gate, ansys-grpc-dpf and ansys-dpg-gatebin
-src/ansys/dpf/core/gate/
-src/ansys/dpf/core/gatebin/
-src/ansys/dpf/core/grpc/
+src/ansys/dpf/gate/
+src/ansys/dpf/gatebin/
+src/ansys/grpc/
 
 # C extensions
 *.so
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000000..8a0f33f90d4
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,12 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+#*       @example
+
+# Order is important. The last matching pattern has the most precedence.
+# So if a pull request only touches javascript files, only these owners
+# will be requested to review.
+src/ansys/grpc/*        @ansys/dpf_integration_proxies
+src/ansys/dpf/gate/*    @ansys/dpf_integration_proxies
+src/ansys/dpf/gatebin/* @ansys/dpf_integration_proxies