diff --git a/prism-node/api/grpc/common_models.proto b/prism-node/client/scala-client/api/grpc/common_models.proto
similarity index 100%
rename from prism-node/api/grpc/common_models.proto
rename to prism-node/client/scala-client/api/grpc/common_models.proto
diff --git a/prism-node/api/grpc/connector_api.proto b/prism-node/client/scala-client/api/grpc/connector_api.proto
similarity index 100%
rename from prism-node/api/grpc/connector_api.proto
rename to prism-node/client/scala-client/api/grpc/connector_api.proto
diff --git a/prism-node/api/grpc/connector_models.proto b/prism-node/client/scala-client/api/grpc/connector_models.proto
similarity index 100%
rename from prism-node/api/grpc/connector_models.proto
rename to prism-node/client/scala-client/api/grpc/connector_models.proto
diff --git a/prism-node/api/grpc/console_api.proto b/prism-node/client/scala-client/api/grpc/console_api.proto
similarity index 100%
rename from prism-node/api/grpc/console_api.proto
rename to prism-node/client/scala-client/api/grpc/console_api.proto
diff --git a/prism-node/api/grpc/console_models.proto b/prism-node/client/scala-client/api/grpc/console_models.proto
similarity index 100%
rename from prism-node/api/grpc/console_models.proto
rename to prism-node/client/scala-client/api/grpc/console_models.proto
diff --git a/prism-node/api/grpc/credential_models.proto b/prism-node/client/scala-client/api/grpc/credential_models.proto
similarity index 100%
rename from prism-node/api/grpc/credential_models.proto
rename to prism-node/client/scala-client/api/grpc/credential_models.proto
diff --git a/prism-node/api/grpc/cviews_api.proto b/prism-node/client/scala-client/api/grpc/cviews_api.proto
similarity index 100%
rename from prism-node/api/grpc/cviews_api.proto
rename to prism-node/client/scala-client/api/grpc/cviews_api.proto
diff --git a/prism-node/api/grpc/cviews_models.proto b/prism-node/client/scala-client/api/grpc/cviews_models.proto
similarity index 100%
rename from prism-node/api/grpc/cviews_models.proto
rename to prism-node/client/scala-client/api/grpc/cviews_models.proto
diff --git a/prism-node/api/grpc/health.proto b/prism-node/client/scala-client/api/grpc/health.proto
similarity index 100%
rename from prism-node/api/grpc/health.proto
rename to prism-node/client/scala-client/api/grpc/health.proto
diff --git a/prism-node/api/grpc/intdemo/intdemo_api.proto b/prism-node/client/scala-client/api/grpc/intdemo/intdemo_api.proto
similarity index 100%
rename from prism-node/api/grpc/intdemo/intdemo_api.proto
rename to prism-node/client/scala-client/api/grpc/intdemo/intdemo_api.proto
diff --git a/prism-node/api/grpc/intdemo/intdemo_models.proto b/prism-node/client/scala-client/api/grpc/intdemo/intdemo_models.proto
similarity index 100%
rename from prism-node/api/grpc/intdemo/intdemo_models.proto
rename to prism-node/client/scala-client/api/grpc/intdemo/intdemo_models.proto
diff --git a/prism-node/api/grpc/node_api.proto b/prism-node/client/scala-client/api/grpc/node_api.proto
similarity index 100%
rename from prism-node/api/grpc/node_api.proto
rename to prism-node/client/scala-client/api/grpc/node_api.proto
diff --git a/prism-node/api/grpc/node_internal.proto b/prism-node/client/scala-client/api/grpc/node_internal.proto
similarity index 100%
rename from prism-node/api/grpc/node_internal.proto
rename to prism-node/client/scala-client/api/grpc/node_internal.proto
diff --git a/prism-node/api/grpc/node_models.proto b/prism-node/client/scala-client/api/grpc/node_models.proto
similarity index 100%
rename from prism-node/api/grpc/node_models.proto
rename to prism-node/client/scala-client/api/grpc/node_models.proto
diff --git a/prism-node/api/grpc/package.json b/prism-node/client/scala-client/api/grpc/package.json
similarity index 100%
rename from prism-node/api/grpc/package.json
rename to prism-node/client/scala-client/api/grpc/package.json
diff --git a/prism-node/api/grpc/resources/markdown.tmpl b/prism-node/client/scala-client/api/grpc/resources/markdown.tmpl
similarity index 100%
rename from prism-node/api/grpc/resources/markdown.tmpl
rename to prism-node/client/scala-client/api/grpc/resources/markdown.tmpl
diff --git a/prism-node/api/grpc/status.proto b/prism-node/client/scala-client/api/grpc/status.proto
similarity index 100%
rename from prism-node/api/grpc/status.proto
rename to prism-node/client/scala-client/api/grpc/status.proto
diff --git a/prism-node/client/scala-client/build.sbt b/prism-node/client/scala-client/build.sbt
index 5fc30c8e17..a4d5174f62 100644
--- a/prism-node/client/scala-client/build.sbt
+++ b/prism-node/client/scala-client/build.sbt
@@ -19,7 +19,7 @@ val commonSettings = Seq(
 
 // Custom keys
 val apiBaseDirectory = settingKey[File]("The base directory for Node 2 API specifications")
-ThisBuild / apiBaseDirectory := baseDirectory.value / "../../api"
+ThisBuild / apiBaseDirectory := baseDirectory.value / "./api"
 
 lazy val root = project
   .in(file("."))