diff --git a/src/components/Blocks/RepeatableContentBlock/Body.jsx b/src/RepeatableContentBlock/Body.jsx
similarity index 92%
rename from src/components/Blocks/RepeatableContentBlock/Body.jsx
rename to src/RepeatableContentBlock/Body.jsx
index 5f87614..43534cc 100644
--- a/src/components/Blocks/RepeatableContentBlock/Body.jsx
+++ b/src/RepeatableContentBlock/Body.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { RichTextRender } from '../../Widget/RichText/RichTextRender';
+import { RichTextRender } from '../Widget/RichText/RichTextRender';
 import { defineMessages, useIntl } from 'react-intl';
 
 const Body = (props) => {
diff --git a/src/components/Blocks/RepeatableContentBlock/Edit.jsx b/src/RepeatableContentBlock/Edit.jsx
similarity index 100%
rename from src/components/Blocks/RepeatableContentBlock/Edit.jsx
rename to src/RepeatableContentBlock/Edit.jsx
diff --git a/src/components/Blocks/RepeatableContentBlock/Sidebar.jsx b/src/RepeatableContentBlock/Sidebar.jsx
similarity index 97%
rename from src/components/Blocks/RepeatableContentBlock/Sidebar.jsx
rename to src/RepeatableContentBlock/Sidebar.jsx
index 08c81e2..50145d6 100644
--- a/src/components/Blocks/RepeatableContentBlock/Sidebar.jsx
+++ b/src/RepeatableContentBlock/Sidebar.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Segment } from 'semantic-ui-react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-import { LinkToWidget } from '../../Widget/LinkToWidget';
+import { LinkToWidget } from '../Widget/LinkToWidget';
 
 const messages = defineMessages({
   select_content: {
diff --git a/src/components/Blocks/RepeatableContentBlock/Skeleton.jsx b/src/RepeatableContentBlock/Skeleton.jsx
similarity index 100%
rename from src/components/Blocks/RepeatableContentBlock/Skeleton.jsx
rename to src/RepeatableContentBlock/Skeleton.jsx
diff --git a/src/components/Blocks/RepeatableContentBlock/View.jsx b/src/RepeatableContentBlock/View.jsx
similarity index 100%
rename from src/components/Blocks/RepeatableContentBlock/View.jsx
rename to src/RepeatableContentBlock/View.jsx
diff --git a/src/components/Widget/LinkToWidget.jsx b/src/Widget/LinkToWidget.jsx
similarity index 100%
rename from src/components/Widget/LinkToWidget.jsx
rename to src/Widget/LinkToWidget.jsx
diff --git a/src/components/Widget/RichText/RenderBlocks.jsx b/src/Widget/RichText/RenderBlocks.jsx
similarity index 100%
rename from src/components/Widget/RichText/RenderBlocks.jsx
rename to src/Widget/RichText/RenderBlocks.jsx
diff --git a/src/components/Widget/RichText/RichText.jsx b/src/Widget/RichText/RichText.jsx
similarity index 100%
rename from src/components/Widget/RichText/RichText.jsx
rename to src/Widget/RichText/RichText.jsx
diff --git a/src/components/Widget/RichText/RichTextRender.jsx b/src/Widget/RichText/RichTextRender.jsx
similarity index 100%
rename from src/components/Widget/RichText/RichTextRender.jsx
rename to src/Widget/RichText/RichTextRender.jsx
diff --git a/src/components/index.js b/src/components/index.js
deleted file mode 100644
index e55dfb8..0000000
--- a/src/components/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Add your components here.
- * @module components
- * @example
- * import Footer from './Footer/Footer';
- *
- * export {
- *   Footer,
- * };
- */
diff --git a/src/index.js b/src/index.js
index 9c61227..66bb777 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 import sitemapSVG from '@plone/volto/icons/form.svg';
-import RepeatableContentEdit from './components/Blocks/RepeatableContentBlock/Edit';
-import RepeatableContentView from './components/Blocks/RepeatableContentBlock/View';
+import RepeatableContentEdit from './RepeatableContentBlock/Edit';
+import RepeatableContentView from './RepeatableContentBlock/View';
 
 const applyConfig = (config) => {
   config.blocks.blocksConfig = {