diff --git a/.secrets.baseline b/.secrets.baseline
index 5e42900b4c..9b102770bf 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$|^.secrets.baseline_temp$",
     "lines": null
   },
-  "generated_at": "2019-08-13T11:48:58Z",
+  "generated_at": "2019-08-14T06:39:18Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -90,7 +90,7 @@
       {
         "hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
         "is_secret": false,
-        "line_number": 87,
+        "line_number": 93,
         "type": "Secret Keyword"
       }
     ],
@@ -254,7 +254,7 @@
         "type": "Private Key"
       }
     ],
-    "frontend/src/components/CreateShootDetails.vue": [
+    "frontend/src/components/CreateShoot/CreateShootDetails.vue": [
       {
         "hashed_secret": "d5d4cd07616a542891b7ec2d0257b3a24b69856e",
         "is_secret": false,
@@ -268,7 +268,7 @@
         "type": "Secret Keyword"
       }
     ],
-    "frontend/src/components/CreateShootInfrastructureDetails.vue": [
+    "frontend/src/components/CreateShoot/CreateShootInfrastructureDetails.vue": [
       {
         "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
         "is_secret": false,
@@ -326,19 +326,19 @@
       {
         "hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
         "is_secret": false,
-        "line_number": 57,
+        "line_number": 54,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
         "is_secret": false,
-        "line_number": 104,
+        "line_number": 101,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "7717bf7a8e425319c10e1783aa343c29e65b8eb7",
         "is_secret": false,
-        "line_number": 120,
+        "line_number": 117,
         "type": "Secret Keyword"
       }
     ],
@@ -358,7 +358,7 @@
       {
         "hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
         "is_secret": false,
-        "line_number": 57,
+        "line_number": 54,
         "type": "Secret Keyword"
       }
     ],
@@ -372,19 +372,19 @@
       {
         "hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
         "is_secret": false,
-        "line_number": 55,
+        "line_number": 52,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
         "is_secret": false,
-        "line_number": 129,
+        "line_number": 120,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "d7dfaa07cdc7acf0f55a2e455e6fd27030e90492",
         "is_secret": false,
-        "line_number": 147,
+        "line_number": 138,
         "type": "Secret Keyword"
       }
     ],
@@ -414,19 +414,19 @@
       {
         "hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
         "is_secret": false,
-        "line_number": 94,
+        "line_number": 82,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
         "is_secret": false,
-        "line_number": 146,
+        "line_number": 134,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "2da371dc54d130d81ade37c43b591fd96bc1b78d",
         "is_secret": false,
-        "line_number": 168,
+        "line_number": 156,
         "type": "Secret Keyword"
       }
     ],
diff --git a/frontend/src/components/CreateShootDetails.vue b/frontend/src/components/CreateShoot/CreateShootDetails.vue
similarity index 99%
rename from frontend/src/components/CreateShootDetails.vue
rename to frontend/src/components/CreateShoot/CreateShootDetails.vue
index cbf3620a59..1ab131618e 100644
--- a/frontend/src/components/CreateShootDetails.vue
+++ b/frontend/src/components/CreateShoot/CreateShootDetails.vue
@@ -211,4 +211,4 @@ export default {
   >>> .flex {
     max-width: 300px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/CreateShootInfrastructureDetails.vue b/frontend/src/components/CreateShoot/CreateShootInfrastructureDetails.vue
similarity index 99%
rename from frontend/src/components/CreateShootInfrastructureDetails.vue
rename to frontend/src/components/CreateShoot/CreateShootInfrastructureDetails.vue
index 0423853240..1907127c1b 100644
--- a/frontend/src/components/CreateShootInfrastructureDetails.vue
+++ b/frontend/src/components/CreateShoot/CreateShootInfrastructureDetails.vue
@@ -432,4 +432,4 @@ export default {
   >>> .flex {
     max-width: 300px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/CreateShootSelectInfrastructure.vue b/frontend/src/components/CreateShoot/CreateShootSelectInfrastructure.vue
similarity index 100%
rename from frontend/src/components/CreateShootSelectInfrastructure.vue
rename to frontend/src/components/CreateShoot/CreateShootSelectInfrastructure.vue
diff --git a/frontend/src/components/AddonConfiguration.vue b/frontend/src/components/ShootAddons/AddonConfiguration.vue
similarity index 97%
rename from frontend/src/components/AddonConfiguration.vue
rename to frontend/src/components/ShootAddons/AddonConfiguration.vue
index 0d62457b3c..83c381cd6b 100644
--- a/frontend/src/components/AddonConfiguration.vue
+++ b/frontend/src/components/ShootAddons/AddonConfiguration.vue
@@ -46,7 +46,7 @@ limitations under the License.
 
 <script>
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
-import ManageShootAddons from '@/components/ManageShootAddons'
+import ManageShootAddons from '@/components/ShootAddons/ManageAddons'
 import { updateShootAddons } from '@/utils/api'
 import { errorDetailsFromError } from '@/utils/error'
 import { shootGetters } from '@/mixins/shootGetters'
diff --git a/frontend/src/components/ManageShootAddons.vue b/frontend/src/components/ShootAddons/ManageAddons.vue
similarity index 100%
rename from frontend/src/components/ManageShootAddons.vue
rename to frontend/src/components/ShootAddons/ManageAddons.vue
diff --git a/frontend/src/components/ClusterAccess.vue b/frontend/src/components/ShootDetails/ShootAccessCard.vue
similarity index 100%
rename from frontend/src/components/ClusterAccess.vue
rename to frontend/src/components/ShootDetails/ShootAccessCard.vue
diff --git a/frontend/src/components/ShootDetailsCard.vue b/frontend/src/components/ShootDetails/ShootDetailsCard.vue
similarity index 96%
rename from frontend/src/components/ShootDetailsCard.vue
rename to frontend/src/components/ShootDetails/ShootDetailsCard.vue
index 74943bc074..b600237e18 100644
--- a/frontend/src/components/ShootDetailsCard.vue
+++ b/frontend/src/components/ShootDetails/ShootDetailsCard.vue
@@ -133,11 +133,11 @@ limitations under the License.
 
 import AccountAvatar from '@/components/AccountAvatar'
 import TimeString from '@/components/TimeString'
-import WorkerGroup from '@/components/WorkerGroup'
-import WorkerConfiguration from '@/components/WorkerConfiguration'
+import WorkerGroup from '@/components/ShootWorkers/WorkerGroup'
+import WorkerConfiguration from '@/components/ShootWorkers/WorkerConfiguration'
 import PurposeConfiguration from '@/components/PurposeConfiguration'
-import ShootVersion from '@/components/ShootVersion'
-import AddonConfiguration from '@/components/AddonConfiguration'
+import ShootVersion from '@/components/ShootVersion/ShootVersion'
+import AddonConfiguration from '@/components/ShootAddons/AddonConfiguration'
 import join from 'lodash/join'
 import filter from 'lodash/filter'
 import map from 'lodash/map'
diff --git a/frontend/src/components/ShootInfrastructureCard.vue b/frontend/src/components/ShootDetails/ShootInfrastructureCard.vue
similarity index 100%
rename from frontend/src/components/ShootInfrastructureCard.vue
rename to frontend/src/components/ShootDetails/ShootInfrastructureCard.vue
diff --git a/frontend/src/components/Journals.vue b/frontend/src/components/ShootDetails/ShootJournalsCard.vue
similarity index 98%
rename from frontend/src/components/Journals.vue
rename to frontend/src/components/ShootDetails/ShootJournalsCard.vue
index 51d2ffda3f..ff4375bca1 100644
--- a/frontend/src/components/Journals.vue
+++ b/frontend/src/components/ShootDetails/ShootJournalsCard.vue
@@ -40,7 +40,7 @@ limitations under the License.
 import get from 'lodash/get'
 import forEach from 'lodash/forEach'
 import { mapState } from 'vuex'
-import Journal from '@/components/Journal'
+import Journal from '@/components/ShootJournals/Journal'
 import { canLinkToSeed } from '@/utils'
 import { shootGetters } from '@/mixins/shootGetters'
 
diff --git a/frontend/src/components/ShootLifecycleCard.vue b/frontend/src/components/ShootDetails/ShootLifecycleCard.vue
similarity index 92%
rename from frontend/src/components/ShootLifecycleCard.vue
rename to frontend/src/components/ShootDetails/ShootLifecycleCard.vue
index 5323b68d2a..872dfb5e99 100644
--- a/frontend/src/components/ShootLifecycleCard.vue
+++ b/frontend/src/components/ShootDetails/ShootLifecycleCard.vue
@@ -32,7 +32,7 @@ limitations under the License.
         </v-flex>
         <v-flex shrink class="pa-0">
           <v-layout row>
-            <shoot-hibernation :shootItem="shootItem"></shoot-hibernation>
+            <change-hibernation :shootItem="shootItem"></change-hibernation>
             <hibernation-configuration ref="hibernationConfiguration" :shootItem="shootItem"></hibernation-configuration>
           </v-layout>
         </v-flex>
@@ -89,17 +89,17 @@ import { mapState } from 'vuex'
 import get from 'lodash/get'
 import moment from 'moment-timezone'
 import { isShootHasNoHibernationScheduleWarning } from '@/utils'
-import ShootHibernation from '@/components/ShootHibernation'
-import MaintenanceStart from '@/components/MaintenanceStart'
-import MaintenanceConfiguration from '@/components/MaintenanceConfiguration'
-import HibernationConfiguration from '@/components/HibernationConfiguration'
+import ChangeHibernation from '@/components/ShootHibernation/ChangeHibernation'
+import MaintenanceStart from '@/components/ShootMaintenance/MaintenanceStart'
+import MaintenanceConfiguration from '@/components/ShootMaintenance/MaintenanceConfiguration'
+import HibernationConfiguration from '@/components/ShootHibernation/HibernationConfiguration'
 import DeleteCluster from '@/components/DeleteCluster'
 import ReconcileStart from '@/components/ReconcileStart'
 import { shootGetters } from '@/mixins/shootGetters'
 
 export default {
   components: {
-    ShootHibernation,
+    ChangeHibernation,
     MaintenanceStart,
     MaintenanceConfiguration,
     HibernationConfiguration,
diff --git a/frontend/src/components/Logging.vue b/frontend/src/components/ShootDetails/ShootLogging.vue
similarity index 100%
rename from frontend/src/components/Logging.vue
rename to frontend/src/components/ShootDetails/ShootLogging.vue
diff --git a/frontend/src/components/MonitoringCard.vue b/frontend/src/components/ShootDetails/ShootMonitoringCard.vue
similarity index 100%
rename from frontend/src/components/MonitoringCard.vue
rename to frontend/src/components/ShootDetails/ShootMonitoringCard.vue
diff --git a/frontend/src/components/ShootHibernation.vue b/frontend/src/components/ShootHibernation/ChangeHibernation.vue
similarity index 100%
rename from frontend/src/components/ShootHibernation.vue
rename to frontend/src/components/ShootHibernation/ChangeHibernation.vue
diff --git a/frontend/src/components/HibernationConfiguration.vue b/frontend/src/components/ShootHibernation/HibernationConfiguration.vue
similarity index 95%
rename from frontend/src/components/HibernationConfiguration.vue
rename to frontend/src/components/ShootHibernation/HibernationConfiguration.vue
index 6915188469..8ab8ad30be 100644
--- a/frontend/src/components/HibernationConfiguration.vue
+++ b/frontend/src/components/ShootHibernation/HibernationConfiguration.vue
@@ -36,10 +36,10 @@ limitations under the License.
       <template slot="affectedObjectName">{{shootName}}</template>
       <template slot="message">
         <v-layout row wrap>
-          <hibernation-schedule
+          <manage-hibernation-schedule
             ref="hibernationSchedule"
             @valid="onHibernationScheduleValid"
-          ></hibernation-schedule>
+          ></manage-hibernation-schedule>
         </v-layout>
       </template>
     </confirm-dialog>
@@ -48,7 +48,7 @@ limitations under the License.
 
 <script>
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
-import HibernationSchedule from '@/components/HibernationSchedule'
+import ManageHibernationSchedule from '@/components/ShootHibernation/ManageHibernationSchedule'
 import { updateShootHibernationSchedules, addShootAnnotation } from '@/utils/api'
 import { errorDetailsFromError } from '@/utils/error'
 import get from 'lodash/get'
@@ -58,7 +58,7 @@ export default {
   name: 'hibernation-configuration',
   components: {
     ConfirmDialog,
-    HibernationSchedule
+    ManageHibernationSchedule
   },
   props: {
     shootItem: {
diff --git a/frontend/src/components/HibernationScheduleEvent.vue b/frontend/src/components/ShootHibernation/HibernationScheduleEvent.vue
similarity index 100%
rename from frontend/src/components/HibernationScheduleEvent.vue
rename to frontend/src/components/ShootHibernation/HibernationScheduleEvent.vue
diff --git a/frontend/src/components/HibernationScheduleWarning.vue b/frontend/src/components/ShootHibernation/HibernationScheduleWarning.vue
similarity index 100%
rename from frontend/src/components/HibernationScheduleWarning.vue
rename to frontend/src/components/ShootHibernation/HibernationScheduleWarning.vue
diff --git a/frontend/src/components/HibernationSchedule.vue b/frontend/src/components/ShootHibernation/ManageHibernationSchedule.vue
similarity index 98%
rename from frontend/src/components/HibernationSchedule.vue
rename to frontend/src/components/ShootHibernation/ManageHibernationSchedule.vue
index 7b10108674..f13b9a0e07 100644
--- a/frontend/src/components/HibernationSchedule.vue
+++ b/frontend/src/components/ShootHibernation/ManageHibernationSchedule.vue
@@ -71,7 +71,7 @@ limitations under the License.
 </template>
 
 <script>
-import HibernationScheduleEvent from '@/components/HibernationScheduleEvent'
+import HibernationScheduleEvent from '@/components/ShootHibernation/HibernationScheduleEvent'
 import forEach from 'lodash/forEach'
 import flatMap from 'lodash/flatMap'
 import get from 'lodash/get'
diff --git a/frontend/src/components/Journal.vue b/frontend/src/components/ShootJournals/Journal.vue
similarity index 95%
rename from frontend/src/components/Journal.vue
rename to frontend/src/components/ShootJournals/Journal.vue
index d570bb6a16..fb6ca71f03 100644
--- a/frontend/src/components/Journal.vue
+++ b/frontend/src/components/ShootJournals/Journal.vue
@@ -45,8 +45,8 @@ limitations under the License.
 import get from 'lodash/get'
 import { mapState, mapGetters } from 'vuex'
 import TimeString from '@/components/TimeString'
-import JournalLabels from '@/components/JournalLabels'
-import JournalComment from '@/components/JournalComment'
+import JournalLabels from '@/components/ShootJournals/JournalLabels'
+import JournalComment from '@/components/ShootJournals/JournalComment'
 
 export default {
   components: {
diff --git a/frontend/src/components/JournalComment.vue b/frontend/src/components/ShootJournals/JournalComment.vue
similarity index 100%
rename from frontend/src/components/JournalComment.vue
rename to frontend/src/components/ShootJournals/JournalComment.vue
diff --git a/frontend/src/components/JournalLabels.vue b/frontend/src/components/ShootJournals/JournalLabels.vue
similarity index 100%
rename from frontend/src/components/JournalLabels.vue
rename to frontend/src/components/ShootJournals/JournalLabels.vue
diff --git a/frontend/src/components/ShootListRow.vue b/frontend/src/components/ShootListRow.vue
index 35fb86794f..725db14c8e 100644
--- a/frontend/src/components/ShootListRow.vue
+++ b/frontend/src/components/ShootListRow.vue
@@ -135,12 +135,12 @@ import ShootStatus from '@/components/ShootStatus'
 import StatusTags from '@/components/StatusTags'
 import PurposeTag from '@/components/PurposeTag'
 import TimeString from '@/components/TimeString'
-import ShootVersion from '@/components/ShootVersion'
+import ShootVersion from '@/components/ShootVersion/ShootVersion'
 import RetryOperation from '@/components/RetryOperation'
-import JournalLabels from '@/components/JournalLabels'
+import JournalLabels from '@/components/ShootJournals/JournalLabels'
 import CopyBtn from '@/components/CopyBtn'
 import SelfTerminationWarning from '@/components/SelfTerminationWarning'
-import HibernationScheduleWarning from '@/components/HibernationScheduleWarning'
+import HibernationScheduleWarning from '@/components/ShootHibernation/HibernationScheduleWarning'
 import DeleteCluster from '@/components/DeleteCluster'
 import forEach from 'lodash/forEach'
 import includes from 'lodash/includes'
diff --git a/frontend/src/components/MaintenanceComponents.vue b/frontend/src/components/ShootMaintenance/MaintenanceComponents.vue
similarity index 100%
rename from frontend/src/components/MaintenanceComponents.vue
rename to frontend/src/components/ShootMaintenance/MaintenanceComponents.vue
diff --git a/frontend/src/components/MaintenanceConfiguration.vue b/frontend/src/components/ShootMaintenance/MaintenanceConfiguration.vue
similarity index 96%
rename from frontend/src/components/MaintenanceConfiguration.vue
rename to frontend/src/components/ShootMaintenance/MaintenanceConfiguration.vue
index 237db84053..a0e33f6709 100644
--- a/frontend/src/components/MaintenanceConfiguration.vue
+++ b/frontend/src/components/ShootMaintenance/MaintenanceConfiguration.vue
@@ -52,8 +52,8 @@ limitations under the License.
 
 <script>
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
-import MaintenanceComponents from '@/components/MaintenanceComponents'
-import MaintenanceTime from '@/components/MaintenanceTime'
+import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
+import MaintenanceTime from '@/components/ShootMaintenance/MaintenanceTime'
 import { updateShootMaintenance } from '@/utils/api'
 import { errorDetailsFromError } from '@/utils/error'
 import get from 'lodash/get'
diff --git a/frontend/src/components/MaintenanceStart.vue b/frontend/src/components/ShootMaintenance/MaintenanceStart.vue
similarity index 98%
rename from frontend/src/components/MaintenanceStart.vue
rename to frontend/src/components/ShootMaintenance/MaintenanceStart.vue
index 765c1b669c..fee3c955e3 100644
--- a/frontend/src/components/MaintenanceStart.vue
+++ b/frontend/src/components/ShootMaintenance/MaintenanceStart.vue
@@ -54,7 +54,7 @@ limitations under the License.
 
 <script>
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
-import MaintenanceComponents from '@/components/MaintenanceComponents'
+import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
 import { addShootAnnotation } from '@/utils/api'
 import { errorDetailsFromError } from '@/utils/error'
 import { SnotifyPosition } from 'vue-snotify'
diff --git a/frontend/src/components/MaintenanceTime.vue b/frontend/src/components/ShootMaintenance/MaintenanceTime.vue
similarity index 100%
rename from frontend/src/components/MaintenanceTime.vue
rename to frontend/src/components/ShootMaintenance/MaintenanceTime.vue
diff --git a/frontend/src/components/ShootVersion.vue b/frontend/src/components/ShootVersion/ShootVersion.vue
similarity index 98%
rename from frontend/src/components/ShootVersion.vue
rename to frontend/src/components/ShootVersion/ShootVersion.vue
index bceb19ec1f..1a885eeb8b 100644
--- a/frontend/src/components/ShootVersion.vue
+++ b/frontend/src/components/ShootVersion/ShootVersion.vue
@@ -97,7 +97,7 @@ limitations under the License.
 </template>
 
 <script>
-import ShootVersionUpdate from '@/components/ShootVersionUpdate'
+import ShootVersionUpdate from '@/components/ShootVersion/ShootVersionUpdate'
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
 import { updateShootVersion } from '@/utils/api'
 import { availableK8sUpdatesForShoot } from '@/utils'
diff --git a/frontend/src/components/ShootVersionUpdate.vue b/frontend/src/components/ShootVersion/ShootVersionUpdate.vue
similarity index 100%
rename from frontend/src/components/ShootVersionUpdate.vue
rename to frontend/src/components/ShootVersion/ShootVersionUpdate.vue
diff --git a/frontend/src/components/MachineImage.vue b/frontend/src/components/ShootWorkers/MachineImage.vue
similarity index 100%
rename from frontend/src/components/MachineImage.vue
rename to frontend/src/components/ShootWorkers/MachineImage.vue
diff --git a/frontend/src/components/MachineType.vue b/frontend/src/components/ShootWorkers/MachineType.vue
similarity index 100%
rename from frontend/src/components/MachineType.vue
rename to frontend/src/components/ShootWorkers/MachineType.vue
diff --git a/frontend/src/components/ManageWorkers.vue b/frontend/src/components/ShootWorkers/ManageWorkers.vue
similarity index 98%
rename from frontend/src/components/ManageWorkers.vue
rename to frontend/src/components/ShootWorkers/ManageWorkers.vue
index 6d5f49eb58..dbc5db910d 100644
--- a/frontend/src/components/ManageWorkers.vue
+++ b/frontend/src/components/ShootWorkers/ManageWorkers.vue
@@ -60,7 +60,7 @@ limitations under the License.
 </template>
 
 <script>
-import WorkerInputGeneric from '@/components/WorkerInputGeneric'
+import WorkerInputGeneric from '@/components/ShootWorkers/WorkerInputGeneric'
 import { mapGetters } from 'vuex'
 import { shortRandomString } from '@/utils'
 import forEach from 'lodash/forEach'
diff --git a/frontend/src/components/VolumeSizeInput.vue b/frontend/src/components/ShootWorkers/VolumeSizeInput.vue
similarity index 100%
rename from frontend/src/components/VolumeSizeInput.vue
rename to frontend/src/components/ShootWorkers/VolumeSizeInput.vue
diff --git a/frontend/src/components/VolumeType.vue b/frontend/src/components/ShootWorkers/VolumeType.vue
similarity index 100%
rename from frontend/src/components/VolumeType.vue
rename to frontend/src/components/ShootWorkers/VolumeType.vue
diff --git a/frontend/src/components/WorkerConfiguration.vue b/frontend/src/components/ShootWorkers/WorkerConfiguration.vue
similarity index 98%
rename from frontend/src/components/WorkerConfiguration.vue
rename to frontend/src/components/ShootWorkers/WorkerConfiguration.vue
index 9f739f68ee..5aa14770e3 100644
--- a/frontend/src/components/WorkerConfiguration.vue
+++ b/frontend/src/components/ShootWorkers/WorkerConfiguration.vue
@@ -46,7 +46,7 @@ limitations under the License.
 
 <script>
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
-import ManageWorkers from '@/components/ManageWorkers'
+import ManageWorkers from '@/components/ShootWorkers/ManageWorkers'
 import { updateShootWorkers } from '@/utils/api'
 import { errorDetailsFromError } from '@/utils/error'
 import { shootGetters } from '@/mixins/shootGetters'
diff --git a/frontend/src/components/WorkerGroup.vue b/frontend/src/components/ShootWorkers/WorkerGroup.vue
similarity index 100%
rename from frontend/src/components/WorkerGroup.vue
rename to frontend/src/components/ShootWorkers/WorkerGroup.vue
diff --git a/frontend/src/components/WorkerInputGeneric.vue b/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
similarity index 97%
rename from frontend/src/components/WorkerInputGeneric.vue
rename to frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
index 50ee4cc9ad..ca577bd06d 100644
--- a/frontend/src/components/WorkerInputGeneric.vue
+++ b/frontend/src/components/ShootWorkers/WorkerInputGeneric.vue
@@ -113,10 +113,10 @@ limitations under the License.
 <script>
 import { mapGetters } from 'vuex'
 import isEmpty from 'lodash/isEmpty'
-import SizeInput from '@/components/VolumeSizeInput'
-import MachineType from '@/components/MachineType'
-import VolumeType from '@/components/VolumeType'
-import MachineImage from '@/components/MachineImage'
+import SizeInput from '@/components/ShootWorkers/VolumeSizeInput'
+import MachineType from '@/components/ShootWorkers/MachineType'
+import VolumeType from '@/components/ShootWorkers/VolumeType'
+import MachineImage from '@/components/ShootWorkers/MachineImage'
 import { required, maxLength, minValue } from 'vuelidate/lib/validators'
 import { getValidationErrors } from '@/utils'
 import { uniqueWorkerName, minVolumeSize, resourceName, noStartEndHyphen, numberOrPercentage } from '@/utils/validators'
diff --git a/frontend/src/pages/CreateShoot.vue b/frontend/src/pages/CreateShoot.vue
index c397540978..ad313c5969 100644
--- a/frontend/src/pages/CreateShoot.vue
+++ b/frontend/src/pages/CreateShoot.vue
@@ -93,11 +93,11 @@ limitations under the License.
         Hibernation
       </v-card-title>
       <v-card-text>
-        <hibernation-schedule
+        <manage-hibernation-schedule
           ref="hibernationSchedule"
           :userInterActionBus="userInterActionBus"
           @valid="onHibernationScheduleValid"
-        ></hibernation-schedule>
+        ></manage-hibernation-schedule>
      </v-card-text>
     </v-card>
     <alert color="error" :message.sync="errorMessage" :detailedMessage.sync="detailedErrorMessage"></alert>
@@ -121,14 +121,14 @@ limitations under the License.
 
 <script>
 
-import CreateShootSelectInfrastructure from '@/components/CreateShootSelectInfrastructure'
-import CreateShootInfrastructureDetails from '@/components/CreateShootInfrastructureDetails'
-import CreateShootDetails from '@/components/CreateShootDetails'
-import ManageShootAddons from '@/components/ManageShootAddons'
-import MaintenanceComponents from '@/components/MaintenanceComponents'
-import MaintenanceTime from '@/components/MaintenanceTime'
-import HibernationSchedule from '@/components/HibernationSchedule'
-import ManageWorkers from '@/components/ManageWorkers'
+import CreateShootSelectInfrastructure from '@/components/CreateShoot/CreateShootSelectInfrastructure'
+import CreateShootInfrastructureDetails from '@/components/CreateShoot/CreateShootInfrastructureDetails'
+import CreateShootDetails from '@/components/CreateShoot/CreateShootDetails'
+import ManageShootAddons from '@/components/ShootAddons/ManageAddons'
+import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
+import MaintenanceTime from '@/components/ShootMaintenance/MaintenanceTime'
+import ManageHibernationSchedule from '@/components/ShootHibernation/ManageHibernationSchedule'
+import ManageWorkers from '@/components/ShootWorkers/ManageWorkers'
 import Alert from '@/components/Alert'
 import ConfirmDialog from '@/dialogs/ConfirmDialog'
 import { mapActions, mapGetters, mapState } from 'vuex'
@@ -152,7 +152,7 @@ export default {
     ManageShootAddons,
     MaintenanceComponents,
     MaintenanceTime,
-    HibernationSchedule,
+    ManageHibernationSchedule,
     ManageWorkers,
     Alert,
     ConfirmDialog
diff --git a/frontend/src/pages/ShootItemCards.vue b/frontend/src/pages/ShootItemCards.vue
index 523de52d65..38e44dd447 100644
--- a/frontend/src/pages/ShootItemCards.vue
+++ b/frontend/src/pages/ShootItemCards.vue
@@ -30,19 +30,19 @@ limitations under the License.
           <v-card-title class="subheading white--text cyan darken-2">
             Access
           </v-card-title>
-          <cluster-access :shootItem="item"></cluster-access>
+          <shoot-access-card :shootItem="item"></shoot-access-card>
         </v-card>
 
-        <monitoring-card :shootItem="item" class="mt-3"></monitoring-card>
+        <shoot-monitoring-card :shootItem="item" class="mt-3"></shoot-monitoring-card>
 
         <v-card v-show="isLoggingFeatureGateEnabled">
           <v-card-title class="subheading white--text cyan darken-2 mt-3">
             Logging
           </v-card-title>
-          <logging :shootItem="item"></logging>
+          <shoot-logging :shootItem="item"></shoot-logging>
         </v-card>
 
-        <journals v-if="isAdmin" :journals="journals" :shootItem="item" class="mt-3"></journals>
+        <shoot-journals-card v-if="isAdmin" :journals="journals" :shootItem="item" class="mt-3"></shoot-journals-card>
 
       </v-flex>
 
@@ -54,13 +54,13 @@ limitations under the License.
 
 <script>
 import { mapGetters } from 'vuex'
-import ClusterAccess from '@/components/ClusterAccess'
-import Journals from '@/components/Journals'
-import MonitoringCard from '@/components/MonitoringCard'
-import Logging from '@/components/Logging'
-import ShootDetailsCard from '@/components/ShootDetailsCard'
-import ShootInfrastructureCard from '@/components/ShootInfrastructureCard'
-import ShootLifecycleCard from '@/components/ShootLifecycleCard'
+import ShootAccessCard from '@/components/ShootDetails/ShootAccessCard'
+import ShootJournalsCard from '@/components/ShootDetails/ShootJournalsCard'
+import ShootMonitoringCard from '@/components/ShootDetails/ShootMonitoringCard'
+import ShootLogging from '@/components/ShootDetails/ShootLogging'
+import ShootDetailsCard from '@/components/ShootDetails/ShootDetailsCard'
+import ShootInfrastructureCard from '@/components/ShootDetails/ShootInfrastructureCard'
+import ShootLifecycleCard from '@/components/ShootDetails/ShootLifecycleCard'
 import get from 'lodash/get'
 
 import 'codemirror/mode/yaml/yaml.js'
@@ -71,10 +71,10 @@ export default {
     ShootDetailsCard,
     ShootInfrastructureCard,
     ShootLifecycleCard,
-    ClusterAccess,
-    Journals,
-    MonitoringCard,
-    Logging
+    ShootAccessCard,
+    ShootJournalsCard,
+    ShootMonitoringCard,
+    ShootLogging
   },
   computed: {
     ...mapGetters([
diff --git a/frontend/src/pages/ShootList.vue b/frontend/src/pages/ShootList.vue
index 20e252d20d..fa243f7012 100644
--- a/frontend/src/pages/ShootList.vue
+++ b/frontend/src/pages/ShootList.vue
@@ -139,7 +139,7 @@ limitations under the License.
               <v-icon>close</v-icon>
             </v-btn>
           </v-card-title>
-          <cluster-access ref="clusterAccess" :shootItem="selectedItem"></cluster-access>
+          <shoot-access-card ref="clusterAccess" :shootItem="selectedItem"></shoot-access-card>
         </v-card>
       </v-dialog>
     </v-card>
@@ -160,13 +160,13 @@ import get from 'lodash/get'
 import pick from 'lodash/pick'
 import join from 'lodash/join'
 import ShootListRow from '@/components/ShootListRow'
-import ClusterAccess from '@/components/ClusterAccess'
+import ShootAccessCard from '@/components/ShootDetails/ShootAccessCard'
 
 export default {
   name: 'shoot-list',
   components: {
     ShootListRow,
-    ClusterAccess
+    ShootAccessCard
   },
   data () {
     return {