diff --git a/src/RepeatableContentBlock/Body.jsx b/src/RepeatableContentBlock/Body.jsx
index 43534cc..3eeaecf 100644
--- a/src/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';
 import { defineMessages, useIntl } from 'react-intl';
 
 const Body = (props) => {
diff --git a/src/RepeatableContentBlock/Sidebar.jsx b/src/RepeatableContentBlock/Sidebar.jsx
index 50145d6..b80e695 100644
--- a/src/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/LinkToWidget';
 
 const messages = defineMessages({
   select_content: {
diff --git a/src/RepeatableContentBlock/Skeleton.jsx b/src/RepeatableContentBlock/Skeleton.jsx
index ceaab06..f729d6d 100644
--- a/src/RepeatableContentBlock/Skeleton.jsx
+++ b/src/RepeatableContentBlock/Skeleton.jsx
@@ -2,27 +2,27 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import {
-  Row,
-  Col,
-  Card,
-  CardBody,
-  CardText,
-  CardTitle,
-} from 'design-react-kit/dist/design-react-kit';
+  GridRow,
+  GridColumn,
+  Grid,
+  CardHeader,
+  CardDescription,
+  CardContent,
+} from 'semantic-ui-react';
 
 const Skeleton = () => {
   return (
     <div className="skeleton-template">
-      <Row>
-        <Col lg={{ size: 12, order: 1 }}>
-          <Card>
-            <CardBody className="pb-2">
-              <CardTitle tag="h2">-</CardTitle>
-              <CardText></CardText>
-            </CardBody>
-          </Card>
-        </Col>
-      </Row>
+      <Grid>
+        <GridRow>
+          <GridColumn>
+            <CardContent className="pb-2">
+              <CardHeader tag="h2">-</CardHeader>
+              <CardDescription></CardDescription>
+            </CardContent>
+          </GridColumn>
+        </GridRow>
+      </Grid>
     </div>
   );
 };
diff --git a/src/RepeatableContentBlock/index.js b/src/RepeatableContentBlock/index.js
new file mode 100644
index 0000000..1700c83
--- /dev/null
+++ b/src/RepeatableContentBlock/index.js
@@ -0,0 +1,5 @@
+export Skeleton from './Skeleton';
+export Edit from './Edit';
+export View from './View';
+export Body from './Body';
+export View from './View';
diff --git a/src/Widget/LinkToWidget.jsx b/src/Widget/LinkToWidget/LinkToWidget.jsx
similarity index 100%
rename from src/Widget/LinkToWidget.jsx
rename to src/Widget/LinkToWidget/LinkToWidget.jsx
diff --git a/src/Widget/RichText/RenderBlocks.jsx b/src/Widget/RichText/RenderBlocks.jsx
index 06d5c31..8391700 100644
--- a/src/Widget/RichText/RenderBlocks.jsx
+++ b/src/Widget/RichText/RenderBlocks.jsx
@@ -16,12 +16,14 @@ const messages = defineMessages({
     defaultMessage: 'Blocco sconosciuto',
   },
 });
+
 /**
  * RenderBlocks view component class.
  * @function RenderBlocks
  * @params {object} content: Content object.
  * @returns {string} Markup of the component.
  */
+
 const RenderBlocks = ({
   data,
   content,
@@ -78,8 +80,8 @@ const RenderBlocks = ({
   ) : null;
 };
 
-export default RenderBlocks;
-
 RenderBlocks.propTypes = {
   data: PropTypes.any,
 };
+
+export default RenderBlocks;
diff --git a/src/Widget/RichText/RichTextRender.jsx b/src/Widget/RichText/RichTextRender.jsx
index b1b245b..fdb97ea 100644
--- a/src/Widget/RichText/RichTextRender.jsx
+++ b/src/Widget/RichText/RichTextRender.jsx
@@ -4,7 +4,7 @@ import cx from 'classnames';
 import { flattenDeep, values } from 'lodash';
 import { flattenHTMLToAppURL } from '@plone/volto/helpers';
 import { hasBlocksData } from '@plone/volto/helpers';
-import { RenderBlocks } from './RenderBlocks';
+import RenderBlocks from './RenderBlocks';
 
 const richTextHasContent = (data) => {
   if (hasBlocksData(data)) {
diff --git a/src/Widget/index.js b/src/Widget/index.js
new file mode 100644
index 0000000..dc08a1c
--- /dev/null
+++ b/src/Widget/index.js
@@ -0,0 +1,3 @@
+export RenderBlocks from './RichText/RenderBlocks';
+export RichText from './RichText/RichText';
+export { RichTextRender } from './RichText/RichTextRender';
diff --git a/src/index.js b/src/index.js
index 207f735..824f25e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,33 +2,21 @@ import sitemapSVG from '@plone/volto/icons/repeat.svg';
 import RepeatableContentEdit from './RepeatableContentBlock/Edit';
 import RepeatableContentView from './RepeatableContentBlock/View';
 
-const applyConfig = (config) => {
-  config.blocks.blocksConfig = {
-    ...(config.blocks.blocksConfig = {
-      repeatableContentBlock: {
-        id: 'repeatableContentBlock',
-        title: 'Contenuto da replicare',
-        icon: sitemapSVG,
-        group: 'common',
-        view: RepeatableContentView,
-        edit: RepeatableContentEdit,
-        restricted: false,
-        mostUsed: true,
-        security: {
-          addPermission: [],
-          view: [],
-        },
-        sidebarTab: 1,
-      },
-    }),
+export default (config) => {
+  config.blocks.blocksConfig.repeatableContentBlock = {
+    id: 'repeatableContentBlock',
+    title: 'Contenuto da replicare',
+    icon: sitemapSVG,
+    group: 'common',
+    view: RepeatableContentView,
+    edit: RepeatableContentEdit,
+    restricted: false,
+    mostUsed: true,
+    security: {
+      addPermission: [],
+      view: [],
+    },
+    sidebarTab: 1,
   };
-  config.settings['volto-blocks-widget'].allowedBlocks = [
-    ...config.settings['volto-blocks-widget'].allowedBlocks,
-    'repeatableContentBlock',
-  ];
-
   return config;
 };
-
-export default applyConfig;
-export { RepeatableContentEdit, RepeatableContentView };