diff --git a/service/docker/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from service/docker/Dockerfile
rename to docker/Dockerfile
diff --git a/service/docker/Dockerfile.aws b/docker/Dockerfile.aws
similarity index 100%
rename from service/docker/Dockerfile.aws
rename to docker/Dockerfile.aws
diff --git a/service/docker/Dockerfile.local b/docker/Dockerfile.local
similarity index 100%
rename from service/docker/Dockerfile.local
rename to docker/Dockerfile.local
diff --git a/service/docker/README.md b/docker/README.md
similarity index 91%
rename from service/docker/README.md
rename to docker/README.md
index 8d032464..870a139b 100644
--- a/service/docker/README.md
+++ b/docker/README.md
@@ -20,12 +20,12 @@ Building a local image:
 $ git clone https://github.com/NASA-PDS/registry-api.git
 $ cd registry-api
 $ mvn package
-$ docker image build --build-arg api_jar=service/target/registry-api-service-*.jar --tag registry-api-service:latest --file service/docker/Dockerfile .
+$ docker image build --build-arg api_jar=service/target/registry-api-service-*.jar --tag registry-api-service:latest --file docker/Dockerfile .
 ```
 
 Building an image from a released jar file:
 ```console
-$ docker image build --build-arg api_jar=https://github.com/NASA-PDS/registry-api/releases/download/v1.0.0/registry-api-service-1.0.0.jar --tag nasapds/registry-api-service:1.0.0 --file service/docker/Dockerfile .
+$ docker image build --build-arg api_jar=https://github.com/NASA-PDS/registry-api/releases/download/v1.0.0/registry-api-service-1.0.0.jar --tag nasapds/registry-api-service:1.0.0 --file docker/Dockerfile .
 ```
 
 ## 📍 Dockerfile.aws
diff --git a/service/terraform/aws/api_uri_rewrite.js b/terraform/aws/api_uri_rewrite.js
similarity index 100%
rename from service/terraform/aws/api_uri_rewrite.js
rename to terraform/aws/api_uri_rewrite.js
diff --git a/service/terraform/aws/test_api_uri_rewrite.html b/terraform/aws/test_api_uri_rewrite.html
similarity index 100%
rename from service/terraform/aws/test_api_uri_rewrite.html
rename to terraform/aws/test_api_uri_rewrite.html
diff --git a/service/terraform/ecs.tf b/terraform/ecs.tf
similarity index 98%
rename from service/terraform/ecs.tf
rename to terraform/ecs.tf
index bdf4ad72..84e9f6eb 100644
--- a/service/terraform/ecs.tf
+++ b/terraform/ecs.tf
@@ -127,8 +127,8 @@ resource "aws_lb_target_group" "pds-registry-target-group" {
 
   health_check {
     enabled = true
-    path    = "/swagger-ui/index.html"
-    matcher = "200,301,302"
+    path    = "/healthcheck"
+    matcher = "200"
     interval = 60
   }
 }
diff --git a/service/terraform/provider.tf b/terraform/provider.tf
similarity index 100%
rename from service/terraform/provider.tf
rename to terraform/provider.tf
diff --git a/service/terraform/secrets.tf b/terraform/secrets.tf
similarity index 100%
rename from service/terraform/secrets.tf
rename to terraform/secrets.tf
diff --git a/service/terraform/variables.tf b/terraform/variables.tf
similarity index 100%
rename from service/terraform/variables.tf
rename to terraform/variables.tf