diff --git a/src/api/v2/support.js b/src/api/v2/support.js
deleted file mode 100644
index a543da8..0000000
--- a/src/api/v2/support.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = ({ instance, headers }) => ({
-  groups: require('./routes/support/groups')({ instance, headers }),
-  search: require('./routes/support/search')({ instance, headers }),
-  tags: require('./routes/support/tags')({ instance, headers }),
-  ticket_comments: require('./routes/support/ticketComments')({
-    instance,
-    headers
-  }),
-  ticket_fields: require('./routes/support/ticketFields')({
-    instance,
-    headers
-  }),
-  ticket_forms: require('./routes/support/ticketForms')({ instance, headers }),
-  ticket_metrics: require('./routes/support/ticketMetrics')({
-    instance,
-    headers
-  }),
-  tickets: require('./routes/support/tickets')({ instance, headers })
-});
diff --git a/src/v2.js b/src/v2.js
deleted file mode 100644
index 6e0b6e0..0000000
--- a/src/v2.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = ({ instance, headers }) => ({
-  support: require('./api/v2/support')({ instance, headers })
-});
diff --git a/src/v2/index.js b/src/v2/index.js
new file mode 100644
index 0000000..23b16dc
--- /dev/null
+++ b/src/v2/index.js
@@ -0,0 +1,3 @@
+module.exports = ({ instance, headers }) => ({
+  support: require('./support')({ instance, headers })
+});
diff --git a/src/api/v2/routes/support/groups.js b/src/v2/support/groups/index.js
similarity index 96%
rename from src/api/v2/routes/support/groups.js
rename to src/v2/support/groups/index.js
index 9085e2a..5ead783 100644
--- a/src/api/v2/routes/support/groups.js
+++ b/src/v2/support/groups/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/groups');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/groups.js b/src/v2/support/groups/validate.js
similarity index 100%
rename from src/api/v2/validators/support/groups.js
rename to src/v2/support/groups/validate.js
diff --git a/src/v2/support/index.js b/src/v2/support/index.js
new file mode 100644
index 0000000..73d7013
--- /dev/null
+++ b/src/v2/support/index.js
@@ -0,0 +1,11 @@
+module.exports = ({ instance, headers }) => ({
+  groups: require('./groups')({ instance, headers }),
+  search: require('./search')({ instance, headers }),
+  tags: require('./tags')({ instance, headers }),
+  ticket_comments: require('./ticket_comments')({ instance, headers }),
+  ticket_fields: require('./ticket_fields')({ instance, headers }),
+  ticket_forms: require('./ticket_forms')({ instance, headers }),
+  ticket_metrics: require('./ticket_metrics')({ instance, headers }),
+  tickets: require('./tickets')({ instance, headers }),
+  users: require('./users')({ instance, headers })
+});
diff --git a/src/api/v2/routes/support/search.js b/src/v2/support/search/index.js
similarity index 86%
rename from src/api/v2/routes/support/search.js
rename to src/v2/support/search/index.js
index f80de3f..aee46b7 100644
--- a/src/api/v2/routes/support/search.js
+++ b/src/v2/support/search/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/search');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/search.js b/src/v2/support/search/validate.js
similarity index 100%
rename from src/api/v2/validators/support/search.js
rename to src/v2/support/search/validate.js
diff --git a/src/api/v2/routes/support/tags.js b/src/v2/support/tags/index.js
similarity index 97%
rename from src/api/v2/routes/support/tags.js
rename to src/v2/support/tags/index.js
index 3d4e3bf..6059333 100644
--- a/src/api/v2/routes/support/tags.js
+++ b/src/v2/support/tags/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/tags');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/tags.js b/src/v2/support/tags/validate.js
similarity index 100%
rename from src/api/v2/validators/support/tags.js
rename to src/v2/support/tags/validate.js
diff --git a/src/api/v2/routes/support/ticketComments.js b/src/v2/support/ticket_comments/index.js
similarity index 95%
rename from src/api/v2/routes/support/ticketComments.js
rename to src/v2/support/ticket_comments/index.js
index eb7c3b7..366ed78 100644
--- a/src/api/v2/routes/support/ticketComments.js
+++ b/src/v2/support/ticket_comments/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/ticketComments');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/ticketComments.js b/src/v2/support/ticket_comments/validate.js
similarity index 100%
rename from src/api/v2/validators/support/ticketComments.js
rename to src/v2/support/ticket_comments/validate.js
diff --git a/src/api/v2/routes/support/ticketFields.js b/src/v2/support/ticket_fields/index.js
similarity index 97%
rename from src/api/v2/routes/support/ticketFields.js
rename to src/v2/support/ticket_fields/index.js
index 37fff81..4f29bb6 100644
--- a/src/api/v2/routes/support/ticketFields.js
+++ b/src/v2/support/ticket_fields/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/ticketFields');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/ticketFields.js b/src/v2/support/ticket_fields/validate.js
similarity index 100%
rename from src/api/v2/validators/support/ticketFields.js
rename to src/v2/support/ticket_fields/validate.js
diff --git a/src/api/v2/routes/support/ticketForms.js b/src/v2/support/ticket_forms/index.js
similarity index 97%
rename from src/api/v2/routes/support/ticketForms.js
rename to src/v2/support/ticket_forms/index.js
index 0cbdc3c..3f4366b 100644
--- a/src/api/v2/routes/support/ticketForms.js
+++ b/src/v2/support/ticket_forms/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/ticketForms');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/ticketForms.js b/src/v2/support/ticket_forms/validate.js
similarity index 100%
rename from src/api/v2/validators/support/ticketForms.js
rename to src/v2/support/ticket_forms/validate.js
diff --git a/src/api/v2/routes/support/ticketMetrics.js b/src/v2/support/ticket_metrics/index.js
similarity index 93%
rename from src/api/v2/routes/support/ticketMetrics.js
rename to src/v2/support/ticket_metrics/index.js
index c484970..2a86805 100644
--- a/src/api/v2/routes/support/ticketMetrics.js
+++ b/src/v2/support/ticket_metrics/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/ticketMetrics');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/ticketMetrics.js b/src/v2/support/ticket_metrics/validate.js
similarity index 100%
rename from src/api/v2/validators/support/ticketMetrics.js
rename to src/v2/support/ticket_metrics/validate.js
diff --git a/src/api/v2/routes/support/tickets.js b/src/v2/support/tickets/index.js
similarity index 99%
rename from src/api/v2/routes/support/tickets.js
rename to src/v2/support/tickets/index.js
index e5a729a..89b4177 100644
--- a/src/api/v2/routes/support/tickets.js
+++ b/src/v2/support/tickets/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/tickets');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/tickets.js b/src/v2/support/tickets/validate.js
similarity index 100%
rename from src/api/v2/validators/support/tickets.js
rename to src/v2/support/tickets/validate.js
diff --git a/src/api/v2/routes/support/users.js b/src/v2/support/users/index.js
similarity index 99%
rename from src/api/v2/routes/support/users.js
rename to src/v2/support/users/index.js
index 4603691..3cc57ba 100644
--- a/src/api/v2/routes/support/users.js
+++ b/src/v2/support/users/index.js
@@ -1,4 +1,4 @@
-const validate = require('../../validators/support/users');
+const validate = require('./validate');
 
 module.exports = ({ instance, headers }) => {
   const url = `https://${instance}.zendesk.com`;
diff --git a/src/api/v2/validators/support/users.js b/src/v2/support/users/validate.js
similarity index 100%
rename from src/api/v2/validators/support/users.js
rename to src/v2/support/users/validate.js
diff --git a/tests/src/api/v2.test.js b/tests/src/v2.test.js
similarity index 50%
rename from tests/src/api/v2.test.js
rename to tests/src/v2.test.js
index 4913265..213c961 100644
--- a/tests/src/api/v2.test.js
+++ b/tests/src/v2.test.js
@@ -1,4 +1,4 @@
-const v2 = require('../../../src/v2');
+const v2 = require('../../src/v2');
 
 const instance = '';
 const headers = {};
@@ -6,13 +6,8 @@ const headers = {};
 describe('zaf v2', () => {
   let zaf;
 
-  beforeEach(() => {
-    zaf = v2({ instance, headers });
-  });
-
-  afterEach(() => {
-    zaf = null;
-  });
+  beforeEach(() => (zaf = v2({ instance, headers })));
+  afterEach(() => (zaf = null));
 
   test('support api', () => expect(zaf.support).toBeDefined());
 });
diff --git a/tests/src/api/v2/support.test.js b/tests/src/v2/support.test.js
similarity index 92%
rename from tests/src/api/v2/support.test.js
rename to tests/src/v2/support.test.js
index 8431a48..e7347fa 100644
--- a/tests/src/api/v2/support.test.js
+++ b/tests/src/v2/support.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../src/api/v2/support');
+const endpoint = require('../../../src/v2/support');
 
 const instance = 'instance';
 const headers = {};
diff --git a/tests/src/api/v2/routes/support/groups.test.js b/tests/src/v2/support/groups.test.js
similarity index 97%
rename from tests/src/api/v2/routes/support/groups.test.js
rename to tests/src/v2/support/groups.test.js
index 4856ab5..77695be 100644
--- a/tests/src/api/v2/routes/support/groups.test.js
+++ b/tests/src/v2/support/groups.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/groups');
+const endpoint = require('../../../../src/v2/support/groups');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/search.test.js b/tests/src/v2/support/search.test.js
similarity index 92%
rename from tests/src/api/v2/routes/support/search.test.js
rename to tests/src/v2/support/search.test.js
index c284c11..aed35af 100644
--- a/tests/src/api/v2/routes/support/search.test.js
+++ b/tests/src/v2/support/search.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/search');
+const endpoint = require('../../../../src/v2/support/search');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/tags.test.js b/tests/src/v2/support/tags.test.js
similarity index 98%
rename from tests/src/api/v2/routes/support/tags.test.js
rename to tests/src/v2/support/tags.test.js
index 733a580..678a4d9 100644
--- a/tests/src/api/v2/routes/support/tags.test.js
+++ b/tests/src/v2/support/tags.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/tags');
+const endpoint = require('../../../../src/v2/support/tags');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/ticketComments.test.js b/tests/src/v2/support/ticket_comments.test.js
similarity index 97%
rename from tests/src/api/v2/routes/support/ticketComments.test.js
rename to tests/src/v2/support/ticket_comments.test.js
index 432a114..b56b0d7 100644
--- a/tests/src/api/v2/routes/support/ticketComments.test.js
+++ b/tests/src/v2/support/ticket_comments.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/ticketComments');
+const endpoint = require('../../../../src/v2/support/ticket_comments');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/ticketFields.test.js b/tests/src/v2/support/ticket_fields.test.js
similarity index 98%
rename from tests/src/api/v2/routes/support/ticketFields.test.js
rename to tests/src/v2/support/ticket_fields.test.js
index 3ace5eb..8a2669e 100644
--- a/tests/src/api/v2/routes/support/ticketFields.test.js
+++ b/tests/src/v2/support/ticket_fields.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/ticketFields');
+const endpoint = require('../../../../src/v2/support/ticket_fields');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/ticketForms.test.js b/tests/src/v2/support/ticket_forms.test.js
similarity index 98%
rename from tests/src/api/v2/routes/support/ticketForms.test.js
rename to tests/src/v2/support/ticket_forms.test.js
index 41642ec..f898b93 100644
--- a/tests/src/api/v2/routes/support/ticketForms.test.js
+++ b/tests/src/v2/support/ticket_forms.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/ticketForms');
+const endpoint = require('../../../../src/v2/support/ticket_forms');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/ticketMetrics.test.js b/tests/src/v2/support/ticket_metrics.test.js
similarity index 95%
rename from tests/src/api/v2/routes/support/ticketMetrics.test.js
rename to tests/src/v2/support/ticket_metrics.test.js
index 73cc44a..d2bed25 100644
--- a/tests/src/api/v2/routes/support/ticketMetrics.test.js
+++ b/tests/src/v2/support/ticket_metrics.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/ticketMetrics');
+const endpoint = require('../../../../src/v2/support/ticket_metrics');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/tickets.test.js b/tests/src/v2/support/tickets.test.js
similarity index 99%
rename from tests/src/api/v2/routes/support/tickets.test.js
rename to tests/src/v2/support/tickets.test.js
index 0943a05..794a72e 100644
--- a/tests/src/api/v2/routes/support/tickets.test.js
+++ b/tests/src/v2/support/tickets.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/tickets');
+const endpoint = require('../../../../src/v2/support/tickets');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;
diff --git a/tests/src/api/v2/routes/support/users.test.js b/tests/src/v2/support/users.test.js
similarity index 99%
rename from tests/src/api/v2/routes/support/users.test.js
rename to tests/src/v2/support/users.test.js
index dcf9eac..bc0d9e4 100644
--- a/tests/src/api/v2/routes/support/users.test.js
+++ b/tests/src/v2/support/users.test.js
@@ -1,4 +1,4 @@
-const endpoint = require('../../../../../../src/api/v2/routes/support/users');
+const endpoint = require('../../../../src/v2/support/users');
 
 const instance = 'instance';
 const url = `https://${instance}.zendesk.com`;