diff --git a/ee/app/assets/javascripts/groups/settings/work_items/create_custom_field.mutation.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/create_custom_field.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/create_custom_field.mutation.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/create_custom_field.mutation.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_field_archive.mutation.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_archive.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/custom_field_archive.mutation.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_archive.mutation.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_field_form.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_form.vue
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/custom_field_form.vue
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_form.vue
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_field_unarchive.mutation.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_unarchive.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/custom_field_unarchive.mutation.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_field_unarchive.mutation.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_fields_list.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_fields_list.vue
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/custom_fields_list.vue
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/custom_fields_list.vue
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/group_custom_field.query.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_custom_field.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/group_custom_field.query.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_custom_field.query.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/group_custom_fields.query.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_custom_fields.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/group_custom_fields.query.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_custom_fields.query.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/group_work_item_types_for_select.query.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_work_item_types_for_select.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/group_work_item_types_for_select.query.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/group_work_item_types_for_select.query.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/update_custom_field.mutation.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_fields/update_custom_field.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/update_custom_field.mutation.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_fields/update_custom_field.mutation.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_status/create_lifecycle_modal.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/create_lifecycle_modal.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0f07dde175ef2c22375e3e47d50ae42c60912c4e
--- /dev/null
+++ b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/create_lifecycle_modal.vue
@@ -0,0 +1,38 @@
+<script>
+import { GlModal } from '@gitlab/ui';
+import { s__ } from '~/locale';
+
+export default {
+  name: 'CreateLifecycle',
+  components: {
+    GlModal,
+  },
+  i18n: {
+    createLifecycle: s__('WorkItem|Create lifecycle'),
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  methods: {
+    closeModal() {
+      this.$emit('close');
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-modal
+    :visible="visible"
+    :title="$options.i18n.createLifecycle"
+    scrollable
+    modal-id="create-lifecycle-modal"
+    @hide="closeModal"
+  >
+    <!-- TODO: Add lifecycle creation form -->
+    {{ $options.i18n.createLifecycle }}
+  </gl-modal>
+</template>
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/custom_status_settings.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/custom_status_settings.vue
similarity index 74%
rename from ee/app/assets/javascripts/groups/settings/work_items/custom_status_settings.vue
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/custom_status_settings.vue
index f77ad4b4feed3dd30eeb8f75512488c3f7c76d73..76a90073e4a45ed89cb692da77abfead1173e453 100644
--- a/ee/app/assets/javascripts/groups/settings/work_items/custom_status_settings.vue
+++ b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/custom_status_settings.vue
@@ -2,13 +2,24 @@
 import { GlAlert, GlButton, GlIcon } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
+import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 import WorkItemStatusBadge from 'ee/work_items/components/shared/work_item_status_badge.vue';
 import StatusModal from './status_modal.vue';
+import CreateLifecycleModal from './create_lifecycle_modal.vue';
 import namespaceStatusesQuery from './namespace_lifecycles.query.graphql';
 
 export default {
-  components: { GlAlert, GlButton, GlIcon, StatusModal, WorkItemStatusBadge, HelpPageLink },
+  components: {
+    GlAlert,
+    GlButton,
+    GlIcon,
+    StatusModal,
+    WorkItemStatusBadge,
+    HelpPageLink,
+    CreateLifecycleModal,
+  },
+  mixins: [glFeatureFlagMixin()],
   props: {
     fullPath: {
       type: String,
@@ -21,6 +32,7 @@ export default {
       errorText: '',
       errorDetail: '',
       selectedLifecycleId: null,
+      showCreateLifecycleModal: false,
     };
   },
   apollo: {
@@ -45,6 +57,9 @@ export default {
     selectedLifecycle() {
       return this.lifecycles.find((lifecycle) => lifecycle.id === this.selectedLifecycleId);
     },
+    workItemStatusMvc2Enabled() {
+      return this.glFeatures.workItemStatusMvc2;
+    },
   },
   methods: {
     dismissAlert() {
@@ -60,6 +75,9 @@ export default {
     handleLifecycleUpdate() {
       this.$apollo.queries.lifecycles.refetch();
     },
+    toggleCreateLifecycleModal() {
+      this.showCreateLifecycleModal = !this.showCreateLifecycleModal;
+    },
   },
 };
 </script>
@@ -98,6 +116,25 @@ export default {
       </details>
     </gl-alert>
 
+    <section
+      v-if="workItemStatusMvc2Enabled"
+      class="gl-mb-4 gl-flex gl-items-center gl-justify-between"
+    >
+      <div>
+        <h5 class="gl-mb-2">{{ s__('WorkItem|Lifecycles') }}</h5>
+        <p class="gl-mb-0">
+          {{
+            s__(
+              'WorkItem|Lifecycles contain statuses that are used together as an item is worked on. Each item type uses a single lifecycle.',
+            )
+          }}
+        </p>
+      </div>
+      <gl-button @click="toggleCreateLifecycleModal">{{
+        s__('WorkItem|Create lifecycle')
+      }}</gl-button>
+    </section>
+
     <div
       v-for="lifecycle in lifecycles"
       :key="lifecycle.id"
@@ -134,5 +171,10 @@ export default {
       @close="closeModal"
       @lifecycle-updated="handleLifecycleUpdate"
     />
+
+    <create-lifecycle-modal
+      :visible="showCreateLifecycleModal"
+      @close="toggleCreateLifecycleModal"
+    />
   </div>
 </template>
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/lifecycle_update.mutation.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/lifecycle_update.mutation.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/lifecycle_update.mutation.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/lifecycle_update.mutation.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/namespace_lifecycles.query.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/namespace_lifecycles.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/namespace_lifecycles.query.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/namespace_lifecycles.query.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/namespace_metadata.query.graphql b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/namespace_metadata.query.graphql
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/namespace_metadata.query.graphql
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/namespace_metadata.query.graphql
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/status_form.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/status_form.vue
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/status_form.vue
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/status_form.vue
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/status_modal.vue b/ee/app/assets/javascripts/groups/settings/work_items/custom_status/status_modal.vue
similarity index 100%
rename from ee/app/assets/javascripts/groups/settings/work_items/status_modal.vue
rename to ee/app/assets/javascripts/groups/settings/work_items/custom_status/status_modal.vue
diff --git a/ee/app/assets/javascripts/groups/settings/work_items/work_item_settings.vue b/ee/app/assets/javascripts/groups/settings/work_items/work_item_settings.vue
index 855db1c2320f82a9a83dbdcf65ebbb893f95f8dc..b91bd8aeacf817b322f1a1bcc7792226d9d4cc67 100644
--- a/ee/app/assets/javascripts/groups/settings/work_items/work_item_settings.vue
+++ b/ee/app/assets/javascripts/groups/settings/work_items/work_item_settings.vue
@@ -1,7 +1,7 @@
 <script>
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import CustomFieldsList from './custom_fields_list.vue';
-import CustomStatusSettings from './custom_status_settings.vue';
+import CustomFieldsList from './custom_fields/custom_fields_list.vue';
+import CustomStatusSettings from './custom_status/custom_status_settings.vue';
 
 export default {
   components: {
diff --git a/ee/spec/frontend/groups/settings/work_items/custom_field_form_spec.js b/ee/spec/frontend/groups/settings/work_items/custom_field_form_spec.js
index ba6032772806cc2f3cb891b859d3555853584f41..5ddb1a00d495bcbf453906709a545f52ea321c7b 100644
--- a/ee/spec/frontend/groups/settings/work_items/custom_field_form_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/custom_field_form_spec.js
@@ -4,11 +4,11 @@ import { GlCollapsibleListbox, GlModal } from '@gitlab/ui';
 import Draggable from 'vuedraggable';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { ENTER_KEY } from '~/lib/utils/keys';
-import CustomFieldForm from 'ee/groups/settings/work_items/custom_field_form.vue';
-import createCustomFieldMutation from 'ee/groups/settings/work_items/create_custom_field.mutation.graphql';
-import updateCustomFieldMutation from 'ee/groups/settings/work_items/update_custom_field.mutation.graphql';
-import groupCustomFieldQuery from 'ee/groups/settings/work_items/group_custom_field.query.graphql';
-import namespaceWorkItemTypesQuery from 'ee/groups/settings/work_items/group_work_item_types_for_select.query.graphql';
+import CustomFieldForm from 'ee/groups/settings/work_items/custom_fields/custom_field_form.vue';
+import createCustomFieldMutation from 'ee/groups/settings/work_items/custom_fields/create_custom_field.mutation.graphql';
+import updateCustomFieldMutation from 'ee/groups/settings/work_items/custom_fields/update_custom_field.mutation.graphql';
+import groupCustomFieldQuery from 'ee/groups/settings/work_items/custom_fields/group_custom_field.query.graphql';
+import namespaceWorkItemTypesQuery from 'ee/groups/settings/work_items/custom_fields/group_work_item_types_for_select.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
diff --git a/ee/spec/frontend/groups/settings/work_items/custom_fields_list_spec.js b/ee/spec/frontend/groups/settings/work_items/custom_fields_list_spec.js
index cba960383f3e48846ea263a598c115b95eaf432a..af44d01a3a3c8b816f2a37f5ae893134dd8e8d0f 100644
--- a/ee/spec/frontend/groups/settings/work_items/custom_fields_list_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/custom_fields_list_spec.js
@@ -6,10 +6,10 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import HelpPageLink from '~/vue_shared/components/help_page_link/help_page_link.vue';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import CustomFieldForm from 'ee/groups/settings/work_items/custom_field_form.vue';
-import CustomFieldsTable from 'ee/groups/settings/work_items/custom_fields_list.vue';
-import groupCustomFieldsQuery from 'ee/groups/settings/work_items/group_custom_fields.query.graphql';
-import customFieldArchiveMutation from 'ee/groups/settings/work_items/custom_field_archive.mutation.graphql';
+import CustomFieldForm from 'ee/groups/settings/work_items/custom_fields/custom_field_form.vue';
+import CustomFieldsTable from 'ee/groups/settings/work_items/custom_fields/custom_fields_list.vue';
+import groupCustomFieldsQuery from 'ee/groups/settings/work_items/custom_fields/group_custom_fields.query.graphql';
+import customFieldArchiveMutation from 'ee/groups/settings/work_items/custom_fields/custom_field_archive.mutation.graphql';
 
 Vue.use(VueApollo);
 
diff --git a/ee/spec/frontend/groups/settings/work_items/custom_status_settings_spec.js b/ee/spec/frontend/groups/settings/work_items/custom_status_settings_spec.js
index 5e25195e936639115acc54ac3882b41fd46a665b..61d9a26111e2839f3c16cab2e38a8cba3f2b5eee 100644
--- a/ee/spec/frontend/groups/settings/work_items/custom_status_settings_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/custom_status_settings_spec.js
@@ -6,8 +6,8 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import WorkItemStatusBadge from 'ee/work_items/components/shared/work_item_status_badge.vue';
-import NamespaceLifecycles from 'ee/groups/settings/work_items/custom_status_settings.vue';
-import namespaceStatusesQuery from 'ee/groups/settings/work_items/namespace_lifecycles.query.graphql';
+import NamespaceLifecycles from 'ee/groups/settings/work_items/custom_status/custom_status_settings.vue';
+import namespaceStatusesQuery from 'ee/groups/settings/work_items/custom_status/namespace_lifecycles.query.graphql';
 
 Vue.use(VueApollo);
 
diff --git a/ee/spec/frontend/groups/settings/work_items/status_form_spec.js b/ee/spec/frontend/groups/settings/work_items/status_form_spec.js
index c89c11d0494ec9aa233a306bdf5e2fd1b42768d1..a52c9354729c5832e505c985f2d117329a0e0e44 100644
--- a/ee/spec/frontend/groups/settings/work_items/status_form_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/status_form_spec.js
@@ -1,7 +1,7 @@
 import { nextTick } from 'vue';
 import { GlDisclosureDropdown, GlIcon } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import InlineStatusForm from 'ee/groups/settings/work_items/status_form.vue';
+import InlineStatusForm from 'ee/groups/settings/work_items/custom_status/status_form.vue';
 
 describe('StatusForm', () => {
   let wrapper;
diff --git a/ee/spec/frontend/groups/settings/work_items/status_modal_spec.js b/ee/spec/frontend/groups/settings/work_items/status_modal_spec.js
index b8ccbe5570f35b6a1df31b41b64c8d9fc77a0605..8bf80947dbe8490d8e34846b874f1443dc49a47e 100644
--- a/ee/spec/frontend/groups/settings/work_items/status_modal_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/status_modal_spec.js
@@ -6,11 +6,11 @@ import { stubComponent } from 'helpers/stub_component';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import createMockApollo from 'helpers/mock_apollo_helper';
-import StatusLifecycleModal from 'ee/groups/settings/work_items/status_modal.vue';
-import StatusForm from 'ee/groups/settings/work_items/status_form.vue';
+import StatusLifecycleModal from 'ee/groups/settings/work_items/custom_status/status_modal.vue';
+import StatusForm from 'ee/groups/settings/work_items/custom_status/status_form.vue';
 import WorkItemStateBadge from '~/work_items/components/work_item_state_badge.vue';
-import lifecycleUpdateMutation from 'ee/groups/settings/work_items/lifecycle_update.mutation.graphql';
-import namespaceMetadataQuery from 'ee/groups/settings/work_items/namespace_metadata.query.graphql';
+import lifecycleUpdateMutation from 'ee/groups/settings/work_items/custom_status/lifecycle_update.mutation.graphql';
+import namespaceMetadataQuery from 'ee/groups/settings/work_items/custom_status/namespace_metadata.query.graphql';
 import { mockNamespaceMetadata, deleteStatusErrorResponse } from './mock_data';
 
 Vue.use(VueApollo);
diff --git a/ee/spec/frontend/groups/settings/work_items/work_item_settings_spec.js b/ee/spec/frontend/groups/settings/work_items/work_item_settings_spec.js
index 8712935d5ba14abb3d97be7230856c2f96145fc1..6742000bd1ae3e46133baf4d496f48f03d9d5aaa 100644
--- a/ee/spec/frontend/groups/settings/work_items/work_item_settings_spec.js
+++ b/ee/spec/frontend/groups/settings/work_items/work_item_settings_spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from '@vue/test-utils';
-import CustomFieldsList from 'ee/groups/settings/work_items/custom_fields_list.vue';
-import CustomStatusSettings from 'ee/groups/settings/work_items/custom_status_settings.vue';
+import CustomFieldsList from 'ee/groups/settings/work_items/custom_fields/custom_fields_list.vue';
+import CustomStatusSettings from 'ee/groups/settings/work_items/custom_status/custom_status_settings.vue';
 import WorkItemSettings from 'ee/groups/settings/work_items/work_item_settings.vue';
 
 describe('WorkItemSettings', () => {
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b2be98b54914fd768157eacb564847ec73411865..acccc9905034fcd43264906b18c7c0ef47c98f04 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -71701,6 +71701,9 @@ msgstr ""
 msgid "WorkItem|Create field"
 msgstr ""
 
+msgid "WorkItem|Create lifecycle"
+msgstr ""
+
 msgid "WorkItem|Created %{timeago}"
 msgstr ""
 
@@ -71874,6 +71877,12 @@ msgstr ""
 msgid "WorkItem|Lavender"
 msgstr ""
 
+msgid "WorkItem|Lifecycles"
+msgstr ""
+
+msgid "WorkItem|Lifecycles contain statuses that are used together as an item is worked on. Each item type uses a single lifecycle."
+msgstr ""
+
 msgid "WorkItem|Light blue"
 msgstr ""