diff --git a/cypress/integration/Google/GoogleCypress.feature b/cypress/integration/GoogleCypress/GoogleCypress.feature
similarity index 100%
rename from cypress/integration/Google/GoogleCypress.feature
rename to cypress/integration/GoogleCypress/GoogleCypress.feature
diff --git a/cypress/integration/Google/GoogleCypressCucumber.feature b/cypress/integration/GoogleCypressCucumber/GoogleCypressCucumber.feature
similarity index 100%
rename from cypress/integration/Google/GoogleCypressCucumber.feature
rename to cypress/integration/GoogleCypressCucumber/GoogleCypressCucumber.feature
diff --git a/cypress/support/elements/GoogleCypressElements.js b/cypress/support/elements/GoogleCypress/GoogleCypressElements.js
similarity index 100%
rename from cypress/support/elements/GoogleCypressElements.js
rename to cypress/support/elements/GoogleCypress/GoogleCypressElements.js
diff --git a/cypress/support/elements/GoogleCypressCucumberElements.js b/cypress/support/elements/GoogleCypressCucumber/GoogleCypressCucumberElements.js
similarity index 100%
rename from cypress/support/elements/GoogleCypressCucumberElements.js
rename to cypress/support/elements/GoogleCypressCucumber/GoogleCypressCucumberElements.js
diff --git a/cypress/support/pageObjects/GoogleCypressObjects.js b/cypress/support/pageObjects/GoogleCypress/GoogleCypressObjects.js
similarity index 86%
rename from cypress/support/pageObjects/GoogleCypressObjects.js
rename to cypress/support/pageObjects/GoogleCypress/GoogleCypressObjects.js
index b879337..287e2fb 100644
--- a/cypress/support/pageObjects/GoogleCypressObjects.js
+++ b/cypress/support/pageObjects/GoogleCypress/GoogleCypressObjects.js
@@ -1,5 +1,5 @@
 /// <reference types="Cypress" />
-import GoogleCypressElements from '../elements/GoogleCypressElements';
+import GoogleCypressElements from '../../elements/GoogleCypress/GoogleCypressElements';
 
 const googleCypressElements = new GoogleCypressElements();
 
diff --git a/cypress/support/pageObjects/GoogleCypressCucumberObjects.js b/cypress/support/pageObjects/GoogleCypressCucumber/GoogleCypressCucumberObjects.js
similarity index 84%
rename from cypress/support/pageObjects/GoogleCypressCucumberObjects.js
rename to cypress/support/pageObjects/GoogleCypressCucumber/GoogleCypressCucumberObjects.js
index ec6756d..1d2c03a 100644
--- a/cypress/support/pageObjects/GoogleCypressCucumberObjects.js
+++ b/cypress/support/pageObjects/GoogleCypressCucumber/GoogleCypressCucumberObjects.js
@@ -1,5 +1,5 @@
 /// <reference types="Cypress" />
-import GoogleCypressCucumberElements from '../elements/GoogleCypressCucumberElements';
+import GoogleCypressCucumberElements from '../../elements/GoogleCypressCucumber/GoogleCypressCucumberElements';
 
 const googleCypressCucumberElements = new GoogleCypressCucumberElements();
 
diff --git a/cypress/support/steps/GoogleCypressSteps.js b/cypress/support/steps/GoogleCypress/GoogleCypressSteps.js
similarity index 84%
rename from cypress/support/steps/GoogleCypressSteps.js
rename to cypress/support/steps/GoogleCypress/GoogleCypressSteps.js
index c6ebbfb..67300fc 100644
--- a/cypress/support/steps/GoogleCypressSteps.js
+++ b/cypress/support/steps/GoogleCypress/GoogleCypressSteps.js
@@ -1,6 +1,6 @@
 /// <reference types="Cypress"/>
 /* global Cypress, cy, expect, Given, When, Then */
-import GoogleCypressObjects from '../pageObjects/GoogleCypressObjects';
+import GoogleCypressObjects from '../../pageObjects/GoogleCypress/GoogleCypressObjects';
 
 const googleCypressObjects = new GoogleCypressObjects();
 
diff --git a/cypress/support/steps/GoogleCypressCucumberSteps.js b/cypress/support/steps/GoogleCypressCucumber/GoogleCypressCucumberSteps.js
similarity index 82%
rename from cypress/support/steps/GoogleCypressCucumberSteps.js
rename to cypress/support/steps/GoogleCypressCucumber/GoogleCypressCucumberSteps.js
index 1022e90..6c031a7 100644
--- a/cypress/support/steps/GoogleCypressCucumberSteps.js
+++ b/cypress/support/steps/GoogleCypressCucumber/GoogleCypressCucumberSteps.js
@@ -1,6 +1,6 @@
 /// <reference types="Cypress"/>
 /* global Cypress, cy, expect, Given, When, Then */
-import GoogleCypressCucumberObjects from '../pageObjects/GoogleCypressCucumberObjects';
+import GoogleCypressCucumberObjects from '../../pageObjects/GoogleCypressCucumber/GoogleCypressCucumberObjects';
 
 const googleCypressCucumberObjects = new GoogleCypressCucumberObjects();