diff --git a/mailpoet/assets/js/src/automation/listing/cells/index.tsx b/mailpoet/assets/js/src/automation/listing/cells/index.tsx
deleted file mode 100644
index db2c704078..0000000000
--- a/mailpoet/assets/js/src/automation/listing/cells/index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './Edit';
-export * from './More';
-export * from './Name';
-export * from './Status';
-export * from './Subscribers';
diff --git a/mailpoet/assets/js/src/automation/listing/cells/Edit.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/edit.tsx
similarity index 87%
rename from mailpoet/assets/js/src/automation/listing/cells/Edit.tsx
rename to mailpoet/assets/js/src/automation/listing/components/cells/edit.tsx
index c860221780..466c444e01 100644
--- a/mailpoet/assets/js/src/automation/listing/cells/Edit.tsx
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/edit.tsx
@@ -1,5 +1,5 @@
 import { __ } from '@wordpress/i18n';
-import { Workflow } from '../workflow';
+import { Workflow } from '../../workflow';
 
 type Props = {
   workflow: Workflow;
diff --git a/mailpoet/assets/js/src/automation/listing/components/cells/index.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/index.tsx
new file mode 100644
index 0000000000..d6a0f6da89
--- /dev/null
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/index.tsx
@@ -0,0 +1,5 @@
+export * from './edit';
+export * from './more';
+export * from './name';
+export * from './status';
+export * from './subscribers';
diff --git a/mailpoet/assets/js/src/automation/listing/cells/More.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/more.tsx
similarity index 95%
rename from mailpoet/assets/js/src/automation/listing/cells/More.tsx
rename to mailpoet/assets/js/src/automation/listing/components/cells/more.tsx
index 8513b95b74..7befa00848 100644
--- a/mailpoet/assets/js/src/automation/listing/cells/More.tsx
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/more.tsx
@@ -1,6 +1,6 @@
 import { EllipsisMenu, MenuItem } from '@woocommerce/components';
 import { __ } from '@wordpress/i18n';
-import { Workflow } from '../workflow';
+import { Workflow } from '../../workflow';
 
 type Props = {
   workflow: Workflow;
diff --git a/mailpoet/assets/js/src/automation/listing/cells/Name.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/name.tsx
similarity index 68%
rename from mailpoet/assets/js/src/automation/listing/cells/Name.tsx
rename to mailpoet/assets/js/src/automation/listing/components/cells/name.tsx
index f96fae21a0..11732d7bbc 100644
--- a/mailpoet/assets/js/src/automation/listing/cells/Name.tsx
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/name.tsx
@@ -1,5 +1,5 @@
-import { Edit } from './Edit';
-import { Workflow } from '../workflow';
+import { Edit } from './edit';
+import { Workflow } from '../../workflow';
 
 type Props = {
   workflow: Workflow;
diff --git a/mailpoet/assets/js/src/automation/listing/cells/Status.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/status.tsx
similarity index 91%
rename from mailpoet/assets/js/src/automation/listing/cells/Status.tsx
rename to mailpoet/assets/js/src/automation/listing/components/cells/status.tsx
index ee67fdde3f..1f0a40bce4 100644
--- a/mailpoet/assets/js/src/automation/listing/cells/Status.tsx
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/status.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { ToggleControl } from '@wordpress/components';
-import { Workflow, WorkflowStatus } from '../workflow';
+import { Workflow, WorkflowStatus } from '../../workflow';
 
 type Props = {
   workflow: Workflow;
diff --git a/mailpoet/assets/js/src/automation/listing/cells/Subscribers.tsx b/mailpoet/assets/js/src/automation/listing/components/cells/subscribers.tsx
similarity index 77%
rename from mailpoet/assets/js/src/automation/listing/cells/Subscribers.tsx
rename to mailpoet/assets/js/src/automation/listing/components/cells/subscribers.tsx
index 1d22b2412e..1c694aa242 100644
--- a/mailpoet/assets/js/src/automation/listing/cells/Subscribers.tsx
+++ b/mailpoet/assets/js/src/automation/listing/components/cells/subscribers.tsx
@@ -1,4 +1,4 @@
-import { Workflow } from '../workflow';
+import { Workflow } from '../../workflow';
 
 type Props = {
   workflow: Workflow;
diff --git a/mailpoet/assets/js/src/automation/listing/get-row.tsx b/mailpoet/assets/js/src/automation/listing/get-row.tsx
index fa5bc767a4..12472f9a77 100644
--- a/mailpoet/assets/js/src/automation/listing/get-row.tsx
+++ b/mailpoet/assets/js/src/automation/listing/get-row.tsx
@@ -1,5 +1,5 @@
 import { Workflow } from './workflow';
-import { Edit, More, Name, Status, Subscribers } from './cells';
+import { Edit, More, Name, Status, Subscribers } from './components/cells';
 
 export function getRow(workflow: Workflow): object[] {
   return [