diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 75a20ea6c3..d7f394b858 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,8 +19,9 @@ What behavior did you expect?
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Client System (please complete the following information):**
- - Outline Client Version [e.g. iOS 1.3.1]
+**System (please complete the following information):**
+ - App Name [e.g. Outline Client]
+ - App Version [e.g. iOS 1.3.1]
  - Your Operating System: [e.g. iOS 14.2, Windows 10]
 
 **Submit Feedback**
diff --git a/.github/ISSUE_TEMPLATE/build_issue.md b/.github/ISSUE_TEMPLATE/build_issue.md
index c40dc9c034..a259e40cb7 100644
--- a/.github/ISSUE_TEMPLATE/build_issue.md
+++ b/.github/ISSUE_TEMPLATE/build_issue.md
@@ -11,6 +11,7 @@ assignees: ''
 A clear and concise description of what the issue is. If possible, paste the output from your terminal.
 
 **Environment**
+ - App: [e.g. Client]
  - OS: [e.g. iOS]
  - NPM version (`npm --version`)
  - Node.js version
diff --git a/.scripts/keep? b/.scripts/keep?
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/outline-apps b/outline-apps
deleted file mode 100644
index 195641e46b..0000000000
--- a/outline-apps
+++ /dev/null
@@ -1 +0,0 @@
-TODO: cli for interacting with different workspaces
\ No newline at end of file
diff --git a/outline_apps b/outline_apps
new file mode 100644
index 0000000000..2a5cd2b138
--- /dev/null
+++ b/outline_apps
@@ -0,0 +1 @@
+TODO: cli for working with the different workspaces in this repo
\ No newline at end of file
diff --git a/infrastructure/TODO b/shared_infrastructure/TODO
similarity index 100%
rename from infrastructure/TODO
rename to shared_infrastructure/TODO