diff --git a/packages/ui-tests/cypress/e2e/beans.cy.ts b/packages/ui-tests/cypress/e2e/beansConfig.cy.ts
similarity index 95%
rename from packages/ui-tests/cypress/e2e/beans.cy.ts
rename to packages/ui-tests/cypress/e2e/beansConfig.cy.ts
index e6013e25d..fdfd2c95e 100644
--- a/packages/ui-tests/cypress/e2e/beans.cy.ts
+++ b/packages/ui-tests/cypress/e2e/beansConfig.cy.ts
@@ -4,7 +4,7 @@ describe('Test for Bean support', () => {
   });
 
   it('Beans - create a new bean using bean editor', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openBeans();
     cy.get('[data-testid="metadata-add-Beans-btn"]').eq(0).click();
     cy.get(`input[name="name"]`).clear().type('test');
@@ -40,7 +40,7 @@ describe('Test for Bean support', () => {
 
   it('Beans - create a new bean using editor and edit in bean editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/Beans.yaml');
+    cy.uploadFixture('flows/camelRoute/beans.yaml');
 
     cy.openBeans();
 
@@ -73,7 +73,7 @@ describe('Test for Bean support', () => {
   });
 
   it('Beans - delete bean properties using the bean editor', () => {
-    cy.uploadFixture('flows/Beans.yaml');
+    cy.uploadFixture('flows/camelRoute/beans.yaml');
     cy.openBeans();
 
     cy.get('[data-testid="metadata-row-0"]').click();
@@ -89,7 +89,7 @@ describe('Test for Bean support', () => {
   });
 
   it('Beans - delete bean using the bean editor', () => {
-    cy.uploadFixture('flows/Beans.yaml');
+    cy.uploadFixture('flows/camelRoute/beans.yaml');
     cy.openBeans();
 
     cy.get('[data-testid="metadata-delete-1-btn"]').click();
diff --git a/packages/ui-tests/cypress/e2e/codeEditor/malformedFlows.cy.ts b/packages/ui-tests/cypress/e2e/codeEditor/malformedFlows.cy.ts
index 98e1969f3..664d20a81 100644
--- a/packages/ui-tests/cypress/e2e/codeEditor/malformedFlows.cy.ts
+++ b/packages/ui-tests/cypress/e2e/codeEditor/malformedFlows.cy.ts
@@ -6,7 +6,7 @@ describe('Test for Multi route actions from the code editor', () => {
   // blocked ATM by https://github.com/KaotoIO/kaoto-next/issues/575
   it.skip('User creates a flow with missing route ID', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/malformed/missingIdRoute.yaml');
+    cy.uploadFixture('flows/malformed/camelRoute/missingId.yaml');
     cy.openDesignPage();
 
     cy.get('span[data-testid="flows-list-route-id"]').should('contain.text', 'route-');
@@ -26,7 +26,7 @@ describe('Test for Multi route actions from the code editor', () => {
   // blocked ATM by https://github.com/KaotoIO/kaoto-next/issues/683
   it.skip('User creates kameletBinding with missing kind definition', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/malformed/missingKindKamelet.yaml');
+    cy.uploadFixture('flows/malformed/kamelet/missingKind.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('timer-source', 0);
@@ -34,12 +34,12 @@ describe('Test for Multi route actions from the code editor', () => {
 
     // verify the route wasn't removed and left for the user to repair
     cy.openSourceCode();
-    cy.compareFileWithMonacoEditor('flows/malformed/missingKindKamelet.yaml');
+    cy.compareFileWithMonacoEditor('flows/malformed/kamelet/missingKind.yaml');
   });
 
   it('User creates a flow with unknown node', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/malformed/unknownNode.yaml');
+    cy.uploadFixture('flows/malformed/camelRoute/unknownNode.yaml');
     cy.openDesignPage();
     cy.checkNodeExist('id', 1);
     cy.openStepConfigurationTab('id');
@@ -48,29 +48,29 @@ describe('Test for Multi route actions from the code editor', () => {
     // Related issue to provide more info https://github.com/KaotoIO/kaoto-next/issues/309
     // verify the route wasn't removed and left for the user to repair
     cy.openSourceCode();
-    cy.compareFileWithMonacoEditor('flows/malformed/unknownNode.yaml');
+    cy.compareFileWithMonacoEditor('flows/malformed/camelRoute/unknownNode.yaml');
   });
 
   it('User creates a flow with wrongly indented node properties', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/malformed/wrongIndentPropertiesKamelet.yaml');
+    cy.uploadFixture('flows/malformed/kamelet/wrongIndentProperties.yaml');
     cy.openDesignPage();
     cy.checkNodeExist('source: Unknown', 1);
 
     // verify the route wasn't removed and left for the user to repair
     cy.openSourceCode();
-    cy.compareFileWithMonacoEditor('flows/malformed/wrongIndentPropertiesKamelet.yaml');
+    cy.compareFileWithMonacoEditor('flows/malformed/kamelet/wrongIndentProperties.yaml');
   });
 
   it('User creates a flow with wrongly indented source definition', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/malformed/wrongIndentSourceKamelet.yaml');
+    cy.uploadFixture('flows/malformed/kamelet/wrongIndentSource.yaml');
     cy.openDesignPage();
     cy.checkNodeExist('source: Unknown', 1);
     cy.checkNodeExist('sink: Unknown', 1);
 
     // verify the route wasn't removed and left for the user to repair
     cy.openSourceCode();
-    cy.compareFileWithMonacoEditor('flows/malformed/wrongIndentSourceKamelet.yaml');
+    cy.compareFileWithMonacoEditor('flows/malformed/kamelet/wrongIndentSource.yaml');
   });
 });
diff --git a/packages/ui-tests/cypress/e2e/codeEditor/multiFlowEditor.cy.ts b/packages/ui-tests/cypress/e2e/codeEditor/multiFlowEditor.cy.ts
index 3c5a53202..9157561e5 100644
--- a/packages/ui-tests/cypress/e2e/codeEditor/multiFlowEditor.cy.ts
+++ b/packages/ui-tests/cypress/e2e/codeEditor/multiFlowEditor.cy.ts
@@ -5,7 +5,7 @@ describe('Test for Multi route actions from the code editor', () => {
 
   it('User deletes first route from multi-route using code editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     cy.openDesignPage();
     cy.get('[data-testid="flows-list-route-count"]').should('have.text', '1/2');
 
@@ -18,7 +18,7 @@ describe('Test for Multi route actions from the code editor', () => {
 
   it('User adds new route to Camel multi-route using code editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
 
     const stepToInsert = `- route:
       id: route-new
@@ -41,7 +41,7 @@ describe('Test for Multi route actions from the code editor', () => {
   });
 
   it('User deletes second route from multi-route using code editor', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
 
     cy.editorDeleteLine(11, 11);
     cy.openDesignPage();
@@ -51,7 +51,7 @@ describe('Test for Multi route actions from the code editor', () => {
   });
 
   it('User deletes step from first route using code editor', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
 
     cy.editorDeleteLine(7, 4);
     cy.openDesignPage();
@@ -61,7 +61,7 @@ describe('Test for Multi route actions from the code editor', () => {
   });
 
   it('User adds step to the first route using code editor', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     const stepToInsert = `        - setHeader:
             constant: test`;
     cy.editorAddText(9, stepToInsert);
@@ -72,7 +72,7 @@ describe('Test for Multi route actions from the code editor', () => {
   });
 
   it('User adds step to the second route using code editor', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     const stepToInsert = `        - setBody:
           constant: test`;
     cy.editorAddText(20, stepToInsert);
diff --git a/packages/ui-tests/cypress/e2e/codeEditor/sourceCodeActions.cy.ts b/packages/ui-tests/cypress/e2e/codeEditor/sourceCodeActions.cy.ts
index f5c03109b..2be26b3ed 100644
--- a/packages/ui-tests/cypress/e2e/codeEditor/sourceCodeActions.cy.ts
+++ b/packages/ui-tests/cypress/e2e/codeEditor/sourceCodeActions.cy.ts
@@ -4,7 +4,7 @@ describe('Test source code editor', () => {
   });
 
   it('loads the YAML editor and deletes steps, check with visualization', () => {
-    cy.uploadFixture('flows/KafkaSourceSinkKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/kafkaSourceSink.yaml');
     cy.openDesignPage();
     cy.get('[data-id^="json-deserialize-action"]').should('exist');
     cy.openSourceCode();
@@ -16,7 +16,7 @@ describe('Test source code editor', () => {
   });
 
   it('User adds step to the YAML', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
 
     const stepToInsert = `  steps:
   - ref:
@@ -31,7 +31,7 @@ describe('Test source code editor', () => {
   });
 
   it('User removes step from the YAML', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
 
     cy.editorDeleteLine(12, 6);
     cy.openDesignPage();
@@ -40,7 +40,7 @@ describe('Test source code editor', () => {
   });
 
   it('User edits step in the YAML', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
 
     cy.editorDeleteLine(13, 1);
     const name = `      name: aws-s3-sink`;
@@ -53,7 +53,7 @@ describe('Test source code editor', () => {
   });
 
   it('User Deletes branch in the YAML', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
 
     cy.editorDeleteLine(41, 7);
     cy.openDesignPage();
@@ -64,7 +64,7 @@ describe('Test source code editor', () => {
   });
 
   it('User Add a new branch in the YAML', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     const stepToInsert = `              - simple: {{}{{}?test}}
                 steps:
                   - to:
@@ -77,7 +77,7 @@ describe('Test source code editor', () => {
   });
 
   it('User undoes a change and redoes a change', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
 
     cy.editorDeleteLine(5, 7);
     // click undo button => reverted automatic adjustments
@@ -98,7 +98,7 @@ describe('Test source code editor', () => {
   });
 
   it('User uploads YAML file, syncs with canvas', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
     cy.openDesignPage();
 
     // CHECK the kafka-sink and timer-source were imported
diff --git a/packages/ui-tests/cypress/e2e/catalog.cy.ts b/packages/ui-tests/cypress/e2e/componentCatalog.cy.ts
similarity index 100%
rename from packages/ui-tests/cypress/e2e/catalog.cy.ts
rename to packages/ui-tests/cypress/e2e/componentCatalog.cy.ts
diff --git a/packages/ui-tests/cypress/e2e/designer/stepAddition.cy.ts b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepAddition.cy.ts
similarity index 89%
rename from packages/ui-tests/cypress/e2e/designer/stepAddition.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepAddition.cy.ts
index 90d9c1f9b..74dbed04d 100644
--- a/packages/ui-tests/cypress/e2e/designer/stepAddition.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepAddition.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - add steps to CamelRoute', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('setHeader');
@@ -21,7 +21,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - add steps to Pipe/KB', () => {
-    cy.uploadFixture('flows/KafkaSourceSinkKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/kafkaSourceSink.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('json-deserialize-action');
diff --git a/packages/ui-tests/cypress/e2e/designer/stepRemoval.cy.ts b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepRemoval.cy.ts
similarity index 90%
rename from packages/ui-tests/cypress/e2e/designer/stepRemoval.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepRemoval.cy.ts
index b03cdd170..2b0d17796 100644
--- a/packages/ui-tests/cypress/e2e/designer/stepRemoval.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepRemoval.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - remove steps from CamelRoute', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
     cy.removeNodeByName('setHeader');
     cy.removeNodeByName('log');
@@ -20,7 +20,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - remove steps from Pipe/KB', () => {
-    cy.uploadFixture('flows/KafkaSourceSinkKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/kafkaSourceSink.yaml');
     cy.openDesignPage();
     cy.removeNodeByName('json-deserialize-action');
     cy.removeNodeByName('kafka-source');
@@ -37,7 +37,7 @@ describe('Tests for Design page', () => {
   });
 
   it('In an integration with at least two steps, user deletes the first step, showing a placeholder step in its place (start-end)', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.removeNodeByName('timer');
@@ -54,7 +54,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Step detail - User deletes a step, which closes the detail drawer', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.openStepConfigurationTab('log');
diff --git a/packages/ui-tests/cypress/e2e/designer/stepReplacement.cy.ts b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepReplacement.cy.ts
similarity index 94%
rename from packages/ui-tests/cypress/e2e/designer/stepReplacement.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepReplacement.cy.ts
index 5c703a9e2..0f7b0188a 100644
--- a/packages/ui-tests/cypress/e2e/designer/stepReplacement.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepReplacement.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - replace steps in CamelRoute', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.selectReplaceNode('timer');
@@ -36,7 +36,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - replace steps in Pipe/KB', () => {
-    cy.uploadFixture('flows/KafkaSourceSinkKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/kafkaSourceSink.yaml');
     cy.openDesignPage();
 
     cy.selectReplaceNode('kafka-source');
diff --git a/packages/ui-tests/cypress/e2e/designer/branchingStepActions.cy.ts b/packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepActions.cy.ts
similarity index 87%
rename from packages/ui-tests/cypress/e2e/designer/branchingStepActions.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepActions.cy.ts
index 6120f47c0..d2dd2dc42 100644
--- a/packages/ui-tests/cypress/e2e/designer/branchingStepActions.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepActions.cy.ts
@@ -4,7 +4,7 @@ describe('User completes normal actions on steps in a branch', () => {
   });
 
   it('User configures a step in a branch', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.openStepConfigurationTab('marshal');
@@ -18,7 +18,7 @@ describe('User completes normal actions on steps in a branch', () => {
   });
 
   it('User deletes a step in a branch', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.removeNodeByName('digitalocean');
@@ -28,7 +28,7 @@ describe('User completes normal actions on steps in a branch', () => {
   });
 
   it('User replaces a step in a branch', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.selectReplaceNode('digitalocean');
diff --git a/packages/ui-tests/cypress/e2e/designer/branchingStepAddition.cy.ts b/packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepAddition.cy.ts
similarity index 88%
rename from packages/ui-tests/cypress/e2e/designer/branchingStepAddition.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepAddition.cy.ts
index df789f932..9b4f815ea 100644
--- a/packages/ui-tests/cypress/e2e/designer/branchingStepAddition.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepAddition.cy.ts
@@ -4,7 +4,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it(' User appends a branch from the canvas', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('when', 3);
@@ -18,7 +18,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it('User deletes a branch from the canvas', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('when', 3);
@@ -36,7 +36,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it('User inserts a branch from the canvas', () => {
-    cy.uploadFixture('flows/BasicKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/basic.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('marshal');
@@ -53,7 +53,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it('User appends a step in a branch from the canvas (last in the branch)', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('setHeader', 1);
@@ -65,7 +65,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it('User prepends a step in a branch from the canvas (first in the branch)', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('digitalocean', 1);
@@ -77,7 +77,7 @@ describe('Test for Branching actions from the canvas', () => {
   });
 
   it('User prepends a step to a step whose previous step contains branches', () => {
-    cy.uploadFixture('flows/ComplexKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/complex.yaml');
     cy.openDesignPage();
 
     cy.checkNodeExist('filter', 1);
diff --git a/packages/ui-tests/cypress/e2e/designer/multiFlowDesigner.cy.ts b/packages/ui-tests/cypress/e2e/designer/multiflow/multiFlowDesigner.cy.ts
similarity index 98%
rename from packages/ui-tests/cypress/e2e/designer/multiFlowDesigner.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/multiflow/multiFlowDesigner.cy.ts
index 47521853e..34bcc1ad7 100644
--- a/packages/ui-tests/cypress/e2e/designer/multiFlowDesigner.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/multiflow/multiFlowDesigner.cy.ts
@@ -31,7 +31,7 @@ describe('Test for Multi route actions from the canvas', () => {
   });
 
   it('User renames routes', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     cy.openDesignPage();
     cy.get('[data-testid="flows-list-route-count"]').should('have.text', '1/2');
     cy.get('[data-testid="flows-list-dropdown"]').click();
diff --git a/packages/ui-tests/cypress/e2e/designer/mandatoryPropsWarnings.cy.ts b/packages/ui-tests/cypress/e2e/designer/propsWarninggs/mandatoryPropsWarnings.cy.ts
similarity index 89%
rename from packages/ui-tests/cypress/e2e/designer/mandatoryPropsWarnings.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/propsWarninggs/mandatoryPropsWarnings.cy.ts
index 38802ae24..2eb4ca390 100644
--- a/packages/ui-tests/cypress/e2e/designer/mandatoryPropsWarnings.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/propsWarninggs/mandatoryPropsWarnings.cy.ts
@@ -1,9 +1,9 @@
-describe('Test for Multi route actions from the canvas', () => {
+describe('Test for missing config props canvas warnings', () => {
   beforeEach(() => {
     cy.openHomePage();
   });
   it('Check the canvas node warnings in Camel Route', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('setHeader');
@@ -29,7 +29,7 @@ describe('Test for Multi route actions from the canvas', () => {
   });
 
   it('Check the canvas node warnings in Pipe', () => {
-    cy.uploadFixture('flows/ErrorHandlerPipe.yaml');
+    cy.uploadFixture('flows/pipe/errorHandler.yaml');
     cy.openDesignPage();
 
     cy.get('[data-id^="delay-action"] g').find('.pf-topology__node__decorator__bg').click();
diff --git a/packages/ui-tests/cypress/e2e/designer/rootContainersConf.cy.ts b/packages/ui-tests/cypress/e2e/designer/rootContainerConfig/rootContainersConf.cy.ts
similarity index 93%
rename from packages/ui-tests/cypress/e2e/designer/rootContainersConf.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/rootContainerConfig/rootContainersConf.cy.ts
index 045fea586..02b9c941f 100644
--- a/packages/ui-tests/cypress/e2e/designer/rootContainersConf.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/rootContainerConfig/rootContainersConf.cy.ts
@@ -1,10 +1,10 @@
-describe('Test for root containers', () => {
+describe('Test for camel route root containers configuration', () => {
   beforeEach(() => {
     cy.openHomePage();
   });
 
   it('Canvas route wrap and unwrap', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     cy.openDesignPage();
     cy.toggleRouteVisibility(1);
 
@@ -29,7 +29,7 @@ describe('Test for root containers', () => {
 
   // Blocked by: https://github.com/KaotoIO/kaoto-next/issues/860
   it.skip('Canvas route wrap and unwrap, toggle visibility', () => {
-    cy.uploadFixture('flows/MultiflowCR.yaml');
+    cy.uploadFixture('flows/camelRoute/multiflow.yaml');
     cy.openDesignPage();
     cy.toggleRouteVisibility(1);
     cy.get('[data-id^="route-1234"]')
@@ -41,8 +41,8 @@ describe('Test for root containers', () => {
     cy.checkNodeExist('log', 0);
   });
 
-  it('Canvas route container config', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+  it('Canvas camel route container config', () => {
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.get('[data-id^="camel-route"]')
diff --git a/packages/ui-tests/cypress/e2e/designer/routeBeanConf.cy.ts b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/routeBeanConf.cy.ts
similarity index 91%
rename from packages/ui-tests/cypress/e2e/designer/routeBeanConf.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/sidepanelConfig/routeBeanConf.cy.ts
index 81ba3fc5e..62e342cfc 100644
--- a/packages/ui-tests/cypress/e2e/designer/routeBeanConf.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/routeBeanConf.cy.ts
@@ -4,8 +4,8 @@ describe('Test for node bean reference and configuration support', () => {
   });
 
   const testData = [
-    { file: 'SqlBeansKamelet.yaml', dataSource: '#bean:{{test}}' },
-    { file: 'SqlBeansCR.yaml', dataSource: '#test' },
+    { file: 'kamelet/sqlBeans.yaml', dataSource: '#bean:{{test}}' },
+    { file: 'camelRoute/sqlBeans.yaml', dataSource: '#test' },
   ];
   testData.forEach((data) => {
     it('Beans - create a new bean in route using bean editor ' + data.file, () => {
@@ -45,8 +45,8 @@ describe('Test for node bean reference and configuration support', () => {
   });
 
   const newTestData = [
-    { file: 'SqlBeansKamelet.yaml', dataSource: '#bean:{{postgreSqlSource}}' },
-    { file: 'SqlBeansCR.yaml', dataSource: '#postgreSqlSource' },
+    { file: 'kamelet/sqlBeans.yaml', dataSource: '#bean:{{postgreSqlSource}}' },
+    { file: 'camelRoute/sqlBeans.yaml', dataSource: '#postgreSqlSource' },
   ];
   newTestData.forEach((data) => {
     it('Beans - select existing bean in node form config ' + data.file, () => {
@@ -82,7 +82,7 @@ describe('Test for node bean reference and configuration support', () => {
 
   // blocked by https://github.com/KaotoIO/kaoto-next/issues/558
   it.skip('Beans - delete bean using the bean editor', () => {
-    cy.uploadFixture('flows/SqlBeansCR.yaml');
+    cy.uploadFixture('flows/camelRoute/sqlBeans.yaml');
     cy.openDesignPage();
     cy.openStepConfigurationTab('sql');
     cy.configureBeanReference('parameters.dataSource', 'postgreSqlSource');
diff --git a/packages/ui-tests/cypress/e2e/designer/stepConfiguration.cy.ts b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/stepConfiguration.cy.ts
similarity index 95%
rename from packages/ui-tests/cypress/e2e/designer/stepConfiguration.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/sidepanelConfig/stepConfiguration.cy.ts
index ce9bb50d5..e08a5bbd2 100644
--- a/packages/ui-tests/cypress/e2e/designer/stepConfiguration.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/stepConfiguration.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for Design page', () => {
   });
 
   it('Design - sidebar step configuration', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
     cy.openDesignPage();
     // Configure timer - source step
     cy.openStepConfigurationTab('timer-source');
diff --git a/packages/ui-tests/cypress/e2e/designer/uriRouteConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/uriRouteConfig.cy.ts
similarity index 93%
rename from packages/ui-tests/cypress/e2e/designer/uriRouteConfig.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/sidepanelConfig/uriRouteConfig.cy.ts
index 14daf10f8..27d6c55ae 100644
--- a/packages/ui-tests/cypress/e2e/designer/uriRouteConfig.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/sidepanelConfig/uriRouteConfig.cy.ts
@@ -3,7 +3,7 @@ describe('Test URI node config', () => {
     cy.openHomePage();
   });
 
-  const testFile = ['flows/UriConfKamelet.yaml', 'flows/UriConfRoute.yaml'];
+  const testFile = ['flows/kamelet/uriConf.yaml', 'flows/camelRoute/uriConf.yaml'];
   testFile.forEach((file) => {
     it('load the URI config route from ' + file + ', edit node in canvas and check', () => {
       cy.uploadFixture(file);
@@ -34,7 +34,7 @@ describe('Test URI node config', () => {
   });
 
   it('User adds URI step to the YAML', () => {
-    cy.uploadFixture('flows/UriConfKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/uriConf.yaml');
     const stepToInsert = `      - to: aws2-s3:testBucket?autoCreateBucket=true`;
     cy.editorAddText(43, stepToInsert);
     cy.openDesignPage();
@@ -54,7 +54,7 @@ describe('Test URI node config', () => {
   });
 
   it('User adds URI step to the YAML', () => {
-    cy.uploadFixture('flows/UriConfRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/uriConf.yaml');
     const stepToInsert = `        - to: aws2-s3:testBucket?autoCreateBucket=true`;
     cy.editorAddText(11, stepToInsert);
     cy.openDesignPage();
diff --git a/packages/ui-tests/cypress/e2e/designer/rootOnException.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialCamelRoutes/rootOnException.cy.ts
similarity index 97%
rename from packages/ui-tests/cypress/e2e/designer/rootOnException.cy.ts
rename to packages/ui-tests/cypress/e2e/designer/specialCamelRoutes/rootOnException.cy.ts
index 9dfb6221c..1b43e10da 100644
--- a/packages/ui-tests/cypress/e2e/designer/rootOnException.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/specialCamelRoutes/rootOnException.cy.ts
@@ -4,7 +4,7 @@ describe('Test for root containers', () => {
   });
 
   it('Root onException steps config', () => {
-    cy.uploadFixture('flows/onExceptionCR.yaml');
+    cy.uploadFixture('flows/camelRoute/onException.yaml');
     cy.openDesignPage();
 
     cy.selectInsertNode('onException-1234');
@@ -26,7 +26,7 @@ describe('Test for root containers', () => {
   });
 
   it('Root onException config', () => {
-    cy.uploadFixture('flows/onExceptionCR.yaml');
+    cy.uploadFixture('flows/camelRoute/onException.yaml');
     cy.openDesignPage();
 
     cy.get('[data-id^="onException"]')
diff --git a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/dataFormatStepConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/dataFormatStepConfig.cy.ts
index e2af2bddf..1129f245b 100644
--- a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/dataFormatStepConfig.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/dataFormatStepConfig.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for sidebar dataformat configuration', () => {
   });
 
   it('Design - sidebar dataformat configuration', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     // Configure marshal dataformat
@@ -24,7 +24,7 @@ describe('Tests for sidebar dataformat configuration', () => {
   });
 
   it('Design - sidebar dataformat configuration in Kamelet', () => {
-    cy.uploadFixture('flows/BasicKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/basic.yaml');
     cy.openDesignPage();
 
     // Configure marshal dataformat
diff --git a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/expressionStepConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/expressionStepConfig.cy.ts
index 9755feabb..0520113e3 100644
--- a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/expressionStepConfig.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/expressionStepConfig.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for sidebar expression configuration', () => {
   });
 
   it('Design - sidebar expression configuration', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
     // Configure setHeader expression
     cy.openStepConfigurationTab('setHeader');
@@ -24,7 +24,7 @@ describe('Tests for sidebar expression configuration', () => {
 
   //reproducer for https://github.com/KaotoIO/kaoto-next/issues/518
   it('Design - name attribute was sometimes lost after expression configuration', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.openStepConfigurationTab('setHeader');
@@ -73,7 +73,7 @@ describe('Tests for sidebar expression configuration', () => {
 
   // Blocked by: https://github.com/KaotoIO/kaoto-next/issues/904
   it.skip('Design - expression configuration with switching type', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
     // Configure setHeader expression
     cy.openStepConfigurationTab('setHeader');
@@ -93,7 +93,7 @@ describe('Tests for sidebar expression configuration', () => {
   });
 
   it('Design - sidebar expression configuration in Kamelet', () => {
-    cy.uploadFixture('flows/BasicKamelet.yaml');
+    cy.uploadFixture('flows/kamelet/basic.yaml');
     cy.openDesignPage();
     // Configure setBody expression
     cy.openStepConfigurationTab('setBody');
diff --git a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts
index 1a1c5c18e..e7248ec55 100644
--- a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for sidebar loadBalancer step configuration', () => {
   });
 
   it('Design - sidebar loadBalancer configuration in CR', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('marshal');
diff --git a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/setHeadersStepConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/setHeadersStepConfig.cy.ts
index 28500b789..4bb7840ad 100644
--- a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/setHeadersStepConfig.cy.ts
+++ b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/setHeadersStepConfig.cy.ts
@@ -4,7 +4,7 @@ describe('Tests for sidebar setHeaders step configuration', () => {
   });
 
   it('Design - sidebar setHeaders configuration in CR', () => {
-    cy.uploadFixture('flows/CamelRoute.yaml');
+    cy.uploadFixture('flows/camelRoute/basic.yaml');
     cy.openDesignPage();
 
     cy.selectAppendNode('marshal');
diff --git a/packages/ui-tests/cypress/e2e/metadata.cy.ts b/packages/ui-tests/cypress/e2e/metadata.cy.ts
index 4bd42b079..2475a4a77 100644
--- a/packages/ui-tests/cypress/e2e/metadata.cy.ts
+++ b/packages/ui-tests/cypress/e2e/metadata.cy.ts
@@ -4,7 +4,7 @@ describe('Test for Metadata Editor support', () => {
   });
 
   it('Metadata Editor - edit metadata using metadata editor', () => {
-    cy.uploadFixture('flows/KafkaSourceSinkKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/kafkaSourceSink.yaml');
     cy.openMetadata();
 
     cy.expandWrappedSection('annotations');
@@ -90,7 +90,7 @@ describe('Test for Metadata Editor support', () => {
 
   it('Metadata Editor - create a new bean using editor and edit in bean editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/MetadataPipe.yaml');
+    cy.uploadFixture('flows/pipe/metadata.yaml');
     cy.openMetadata();
 
     cy.get(`input[name="creationTimestamp"]`).clear().type('updatedCreationTimestamp');
@@ -121,7 +121,7 @@ describe('Test for Metadata Editor support', () => {
 
   it('Metadata Editor - delete bean properties using the bean editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/MetadataPipe.yaml');
+    cy.uploadFixture('flows/pipe/metadata.yaml');
     cy.openMetadata();
 
     cy.expandWrappedSection('annotations');
diff --git a/packages/ui-tests/cypress/e2e/errorHandler.cy.ts b/packages/ui-tests/cypress/e2e/pipeErrorHandler.cy.ts
similarity index 92%
rename from packages/ui-tests/cypress/e2e/errorHandler.cy.ts
rename to packages/ui-tests/cypress/e2e/pipeErrorHandler.cy.ts
index 550243ceb..95265959f 100644
--- a/packages/ui-tests/cypress/e2e/errorHandler.cy.ts
+++ b/packages/ui-tests/cypress/e2e/pipeErrorHandler.cy.ts
@@ -1,10 +1,10 @@
-describe('Test for Error handler support', () => {
+describe('Test for Pipe Error handler support', () => {
   beforeEach(() => {
     cy.openHomePage();
   });
 
   it('ErrorHandler - create a new errorHandler using errorHandler editor', () => {
-    cy.uploadFixture('flows/TimerKafkaKB.yaml');
+    cy.uploadFixture('flows/kameletBinding/timerKafka.yaml');
     cy.openPipeErrorHandler();
     cy.get('.pf-v5-c-menu-toggle__toggle-icon').click();
     cy.get('[data-testid="pipe-error-handler-select-option-log"]').click();
@@ -44,7 +44,7 @@ describe('Test for Error handler support', () => {
 
   it('ErrorHandler - edit in errorHandler editor', () => {
     cy.openSourceCode();
-    cy.uploadFixture('flows/ErrorHandlerPipe.yaml');
+    cy.uploadFixture('flows/pipe/errorHandler.yaml');
     cy.openPipeErrorHandler();
     cy.get(`input[name="log.parameters.maximumRedeliveries"]`).clear().type('5');
     cy.get(`input[name="log.parameters.redeliveryDelay"]`).clear().type('1000');
@@ -55,7 +55,7 @@ describe('Test for Error handler support', () => {
   });
 
   it('ErrorHandler - delete errorHandler properties using the ErrorHandler editor', () => {
-    cy.uploadFixture('flows/ErrorHandlerPipe.yaml');
+    cy.uploadFixture('flows/pipe/errorHandler.yaml');
     cy.openPipeErrorHandler();
 
     cy.get(`input[name="log.parameters.maximumRedeliveries"]`).clear();
@@ -68,7 +68,7 @@ describe('Test for Error handler support', () => {
   });
 
   it('ErrorHandler - select "no error handlers" - delete errorHandler', () => {
-    cy.uploadFixture('flows/ErrorHandlerPipe.yaml');
+    cy.uploadFixture('flows/pipe/errorHandler.yaml');
     cy.openPipeErrorHandler();
     cy.get('.pf-v5-c-menu-toggle__toggle-icon').click();
     cy.get('[data-testid="pipe-error-handler-select-option-none"]').click();
diff --git a/packages/ui-tests/cypress/fixtures/flows/Integration.yaml b/packages/ui-tests/cypress/fixtures/flows/Integration.yaml
deleted file mode 100644
index bccd84909..000000000
--- a/packages/ui-tests/cypress/fixtures/flows/Integration.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: camel.apache.org/v1
-kind: Integration
-metadata:
-  name: Integration-1
-spec:
-  flows:
-  - route:
-      id: route-1234
-      from:
-        uri: cron:cron
-        parameters:
-          schedule: '1000'
-        steps:
-        - set-body:
-            simple: body
-        - to:
-            uri: log:log1
diff --git a/packages/ui-tests/cypress/fixtures/flows/CamelRoute.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/basic.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/CamelRoute.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/basic.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/Beans.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/beans.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/Beans.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/beans.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/errorHandlerCR.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/errorHandlerRoute.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/errorHandlerCR.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/errorHandlerRoute.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/MultiflowCR.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/MultiflowCR.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/onExceptionCR.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/onException.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/onExceptionCR.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/onException.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/SqlBeansCR.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/sqlBeans.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/SqlBeansCR.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/sqlBeans.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/UriConfRoute.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/uriConf.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/UriConfRoute.yaml
rename to packages/ui-tests/cypress/fixtures/flows/camelRoute/uriConf.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/BasicKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/kamelet/basic.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/BasicKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kamelet/basic.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/ComplexKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/kamelet/complex.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/ComplexKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kamelet/complex.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/SqlBeansKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/kamelet/sqlBeans.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/SqlBeansKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kamelet/sqlBeans.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/UriConfKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/kamelet/uriConf.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/UriConfKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kamelet/uriConf.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/KafkaSourceSinkKB.yaml b/packages/ui-tests/cypress/fixtures/flows/kameletBinding/kafkaSourceSink.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/KafkaSourceSinkKB.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kameletBinding/kafkaSourceSink.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/TimerKafkaKB.yaml b/packages/ui-tests/cypress/fixtures/flows/kameletBinding/timerKafka.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/TimerKafkaKB.yaml
rename to packages/ui-tests/cypress/fixtures/flows/kameletBinding/timerKafka.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/missingIdRoute.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/malformed/missingIdRoute.yaml
rename to packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/unknownNode.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/malformed/unknownNode.yaml
rename to packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/missingKindKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/missingKind.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/malformed/missingKindKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/missingKind.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/wrongIndentPropertiesKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/wrongIndentProperties.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/malformed/wrongIndentPropertiesKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/wrongIndentProperties.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/wrongIndentSourceKamelet.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/wrongIndentSource.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/malformed/wrongIndentSourceKamelet.yaml
rename to packages/ui-tests/cypress/fixtures/flows/malformed/kamelet/wrongIndentSource.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/ErrorHandlerPipe.yaml b/packages/ui-tests/cypress/fixtures/flows/pipe/errorHandler.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/ErrorHandlerPipe.yaml
rename to packages/ui-tests/cypress/fixtures/flows/pipe/errorHandler.yaml
diff --git a/packages/ui-tests/cypress/fixtures/flows/MetadataPipe.yaml b/packages/ui-tests/cypress/fixtures/flows/pipe/metadata.yaml
similarity index 100%
rename from packages/ui-tests/cypress/fixtures/flows/MetadataPipe.yaml
rename to packages/ui-tests/cypress/fixtures/flows/pipe/metadata.yaml