diff --git a/src/components/Application/ApplicationCard.vue b/src/components/Application/ApplicationCard.vue
index 7ebfb94..07c664e 100644
--- a/src/components/Application/ApplicationCard.vue
+++ b/src/components/Application/ApplicationCard.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import ApplicationTags from '@/components/ApplicationTags'
+import ApplicationTags from '@/components/Application/ApplicationTags'
 
 export default {
   components: {
diff --git a/src/components/TaskLog/TaskLog.vue b/src/components/Environment/TaskLog/TaskLog.vue
similarity index 89%
rename from src/components/TaskLog/TaskLog.vue
rename to src/components/Environment/TaskLog/TaskLog.vue
index 37f1862..711a61c 100644
--- a/src/components/TaskLog/TaskLog.vue
+++ b/src/components/Environment/TaskLog/TaskLog.vue
@@ -15,7 +15,7 @@
 
 <script>
 import _ from 'lodash'
-import TaskLogItem from '@/components/TaskLogItem'
+import TaskLogItem from '@/components/Environment/TaskLog/TaskLogItem'
 
 export default {
   components: {
diff --git a/src/components/TaskLog/TaskLogItem.vue b/src/components/Environment/TaskLog/TaskLogItem.vue
similarity index 100%
rename from src/components/TaskLog/TaskLogItem.vue
rename to src/components/Environment/TaskLog/TaskLogItem.vue
diff --git a/src/views/Applications.vue b/src/views/Applications.vue
index 7386680..0efef0e 100644
--- a/src/views/Applications.vue
+++ b/src/views/Applications.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import ApplicationCard from '@/components/ApplicationCard'
-import ApplicationDisplaySwitcher from '@/components/ApplicationDisplaySwitcher'
+import ApplicationCard from '@/components/Application/ApplicationCard'
+import ApplicationDisplaySwitcher from '@/components/Application/ApplicationDisplaySwitcher'
 import data from '@/data.json'
 
 export default {
diff --git a/src/views/Environments.vue b/src/views/Environments.vue
index 8e0a250..bd58380 100644
--- a/src/views/Environments.vue
+++ b/src/views/Environments.vue
@@ -74,11 +74,11 @@
 </template>
 
 <script>
-import ApplicationTags from '@/components/ApplicationTags'
-import EnvironmentCards from '@/components/EnvironmentCards'
-import QuickHelp from '@/components/QuickHelp'
-import TaskLog from '@/components/TaskLog'
-import ToggleHelp from '@/components/ToggleHelp'
+import ApplicationTags from '@/components/Application/ApplicationTags'
+import EnvironmentCards from '@/components/Environment/EnvironmentCards'
+import QuickHelp from '@/components/Environment/QuickHelp'
+import TaskLog from '@/components/Environment/TaskLog/TaskLog'
+import ToggleHelp from '@/components/Environment/ToggleHelp'
 import data from '@/data.json'
 
 export default {