diff --git a/src/components/Schema/index.ts b/src/components/Schema/index.ts
index 5adcc326..8c25b7cd 100644
--- a/src/components/Schema/index.ts
+++ b/src/components/Schema/index.ts
@@ -1 +1,5 @@
 export * from './Schema';
+export * from './ObjectSchema';
+export * from './OneOfSchema';
+export * from './ArraySchema';
+export * from './DiscriminatorDropdown';
diff --git a/src/components/Schema/__tests__/DiscriminatorDropdown.test.tsx b/src/components/__tests__/DiscriminatorDropdown.test.tsx
similarity index 85%
rename from src/components/Schema/__tests__/DiscriminatorDropdown.test.tsx
rename to src/components/__tests__/DiscriminatorDropdown.test.tsx
index 3ca4579f..0ccbd23c 100644
--- a/src/components/Schema/__tests__/DiscriminatorDropdown.test.tsx
+++ b/src/components/__tests__/DiscriminatorDropdown.test.tsx
@@ -2,12 +2,11 @@ import * as React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 
-import { filterPropsDeep } from '../../../utils/test-utils';
+import { filterPropsDeep } from '../../utils/test-utils';
 
-import { RedocNormalizedOptions } from '../../../services/RedocNormalizedOptions';
-import { OpenAPIParser, SchemaModel } from '../../../services';
-import { Schema } from '../Schema';
-import { ObjectSchema } from '../ObjectSchema';
+import { RedocNormalizedOptions } from '../../services/RedocNormalizedOptions';
+import { OpenAPIParser, SchemaModel } from '../../services';
+import { Schema, ObjectSchema } from '../';
 import * as simpleDiscriminatorFixture from './fixtures/simple-discriminator.json';
 
 const options = new RedocNormalizedOptions({});
diff --git a/src/components/Schema/__tests__/OneOfSchema.test.tsx b/src/components/__tests__/OneOfSchema.test.tsx
similarity index 81%
rename from src/components/Schema/__tests__/OneOfSchema.test.tsx
rename to src/components/__tests__/OneOfSchema.test.tsx
index 2c39ad45..350628b8 100644
--- a/src/components/Schema/__tests__/OneOfSchema.test.tsx
+++ b/src/components/__tests__/OneOfSchema.test.tsx
@@ -2,12 +2,11 @@ import * as React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 
-import { filterPropsDeep } from '../../../utils/test-utils';
+import { filterPropsDeep } from '../../utils/test-utils';
 
-import { RedocNormalizedOptions } from '../../../services/RedocNormalizedOptions';
-import { OpenAPIParser, SchemaModel } from '../../../services';
-import { Schema } from '../Schema';
-import { OneOfSchema } from '../OneOfSchema';
+import { RedocNormalizedOptions } from '../../services/RedocNormalizedOptions';
+import { OpenAPIParser, SchemaModel } from '../../services';
+import { Schema, OneOfSchema } from '../';
 
 const options = new RedocNormalizedOptions({});
 describe('Components', () => {
diff --git a/src/components/Schema/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap b/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
similarity index 100%
rename from src/components/Schema/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
rename to src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
diff --git a/src/components/Schema/__tests__/fixtures/simple-discriminator.json b/src/components/__tests__/fixtures/simple-discriminator.json
similarity index 100%
rename from src/components/Schema/__tests__/fixtures/simple-discriminator.json
rename to src/components/__tests__/fixtures/simple-discriminator.json