diff --git a/api/api-component.yaml b/api/main-api.yaml
similarity index 87%
rename from api/api-component.yaml
rename to api/main-api.yaml
index 69d0e7e..60c31aa 100644
--- a/api/api-component.yaml
+++ b/api/main-api.yaml
@@ -8,4 +8,4 @@ spec:
   lifecycle: prodiction
   owner: team-c
   definition:
-    $text: example.yaml
\ No newline at end of file
+    $text: sample-api.yaml
\ No newline at end of file
diff --git a/api/example.yaml b/api/sample-api.yaml
similarity index 100%
rename from api/example.yaml
rename to api/sample-api.yaml
diff --git a/backstage/all-apis.yaml b/apis.yaml
similarity index 81%
rename from backstage/all-apis.yaml
rename to apis.yaml
index 021bdb8..0fd5cd1 100644
--- a/backstage/all-apis.yaml
+++ b/apis.yaml
@@ -5,4 +5,4 @@ metadata:
   description: A collection of Athena APIs
 spec:
   targets:
-    - ../api/api-component.yaml
\ No newline at end of file
+    - ./api/main-api.yaml
\ No newline at end of file
diff --git a/backstage/all-domains.yaml b/backstage/all-domains.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/backstage/all-resources.yaml b/backstage/all-resources.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/backstage/main.yaml b/backstage/main.yaml
deleted file mode 100644
index 86f1db1..0000000
--- a/backstage/main.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: backstage.io/v1alpha1
-kind: Location
-metadata:
-  name: example-all
-  description: A collection of all Backstage example entities, except users, groups, and templates
-spec:
-  targets:
-    - ./all-apis.yaml
-    - ./all-components.yaml
-    # - ./all-domains.yaml
-    # - ./all-resources.yaml
-    - ./all-systems.yaml
\ No newline at end of file
diff --git a/backstage/all-components.yaml b/components.yaml
similarity index 75%
rename from backstage/all-components.yaml
rename to components.yaml
index 56071b4..4e0f478 100644
--- a/backstage/all-components.yaml
+++ b/components.yaml
@@ -3,7 +3,7 @@ kind: Component
 metadata:
   name: Athena
   annotations:
-    backstage.io/techdocs-ref: dir:..
+    backstage.io/techdocs-ref: dir:.
 spec:
   type: documentation
   lifecycle: production
diff --git a/entities.yaml b/entities.yaml
deleted file mode 100644
index 206e87a..0000000
--- a/entities.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system
-apiVersion: backstage.io/v1alpha1
-kind: System
-metadata:
-  name: examples
-spec:
-  owner: guests
----
-# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-component
-apiVersion: backstage.io/v1alpha1
-kind: Component
-metadata:
-  name: Athena
-  annotations:
-    backstage.io/techdocs-ref: dir:.
-spec:
-  type: documentation
-  lifecycle: production
-  owner: guests
-  system: examples
-  providesApis: []
----
-apiVersion: backstage.io/v1alpha1
-kind: Location
-metadata:
-  name: AthenaAPIs
-  description: A collection of Athena APIs
-spec:
-  targets:
-    - ./api/api-component.yaml
\ No newline at end of file
diff --git a/main.yaml b/main.yaml
new file mode 100644
index 0000000..5d8d39d
--- /dev/null
+++ b/main.yaml
@@ -0,0 +1,12 @@
+# https://backstage.io/docs/features/software-catalog/descriptor-format
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: Infrastructure
+  description: All components of backstage infrastructure for this project
+spec:
+  targets:
+    - ./apis.yaml
+    - ./components.yaml
+    - ./systems.yaml
+    - ./organizations.yaml
\ No newline at end of file
diff --git a/org.yaml b/organizations.yaml
similarity index 100%
rename from org.yaml
rename to organizations.yaml
diff --git a/backstage/all-systems.yaml b/systems.yaml
similarity index 100%
rename from backstage/all-systems.yaml
rename to systems.yaml