diff --git a/src/assets/icons/ico/accessibility.svg b/src/assets/icons/ico/accessibility.svg
new file mode 100644
index 0000000000000000000000000000000000000000..fcfad1c0f34298927a69ce53b37a76e5294cf9d9
--- /dev/null
+++ b/src/assets/icons/ico/accessibility.svg
@@ -0,0 +1,4 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.0002 10.5883C20.2672 10.5883 21.2943 9.56118 21.2943 8.29418C21.2943 7.02717 20.2672 6.00006 19.0002 6.00006C17.7332 6.00006 16.7061 7.02717 16.7061 8.29418C16.7061 9.56118 17.7332 10.5883 19.0002 10.5883ZM10.0465 10.8921L17.0043 13.0329C18.3047 13.433 19.6953 13.433 20.9957 13.0329L27.9535 10.8921C28.4443 10.741 28.9412 11.108 28.9412 11.6215C28.9412 11.9232 28.7636 12.1965 28.4879 12.319L22.7143 14.8851C22.3157 15.0622 22.0588 15.4575 22.0588 15.8937V19.4508C22.0588 20.6781 22.1459 21.9038 22.3195 23.1187L23.4575 31.0846C23.5265 31.5677 23.1517 31.9999 22.6637 31.9999C22.3057 31.9999 21.991 31.7626 21.8927 31.4183L19.4956 23.0285C19.3532 22.5301 18.6468 22.5301 18.5044 23.0285L16.1074 31.4183C16.009 31.7626 15.6944 31.9999 15.3363 31.9999C14.8484 31.9999 14.4735 31.5677 14.5425 31.0846L15.6805 23.1187C15.8541 21.9038 15.9412 20.6781 15.9412 19.4508V15.8937C15.9412 15.4575 15.6843 15.0622 15.2857 14.8851L9.5121 12.319C9.23647 12.1965 9.05884 11.9232 9.05884 11.6215C9.05884 11.108 9.55573 10.741 10.0465 10.8921Z" fill="white"/>
+<rect x="0.5" y="0.811462" width="37" height="36.377" rx="18.1885" stroke="white"/>
+</svg>
diff --git a/src/assets/icons/ico/gcu.svg b/src/assets/icons/ico/gcu.svg
new file mode 100644
index 0000000000000000000000000000000000000000..677a646549e170eed799df0b52bdd52ca1410a7d
--- /dev/null
+++ b/src/assets/icons/ico/gcu.svg
@@ -0,0 +1,12 @@
+<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.431 31.5V6.5H26.569V25.9276L21.2079 31.5H11.431Z" stroke="white"/>
+<path d="M25.9227 26.5L21.9998 30.7264V26.5H25.9227Z" stroke="white"/>
+<line x1="13.6207" y1="9.08621" x2="24.3793" y2="9.08621" stroke="white"/>
+<line x1="13.6207" y1="11.7759" x2="24.3793" y2="11.7759" stroke="white"/>
+<line x1="13.6207" y1="14.4655" x2="24.3793" y2="14.4655" stroke="white"/>
+<line x1="13.6207" y1="17.1552" x2="24.3793" y2="17.1552" stroke="white"/>
+<line x1="13.6207" y1="19.8448" x2="24.3793" y2="19.8448" stroke="white"/>
+<line x1="13.6207" y1="22.5345" x2="19.8966" y2="22.5345" stroke="white"/>
+<path d="M13.6207 26.6207L15.4138 28.4138L19 24.8276" stroke="white"/>
+<rect x="0.5" y="0.811478" width="37" height="36.377" rx="18.1885" stroke="white"/>
+</svg>
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 8fada099d1c4dc912c144f9c682b210829c97474..011f6429be73c3aa0e2ad278587933773669a174 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,7 +1,7 @@
 import Navbar from 'components/Navbar/Navbar'
-import WelcomeModal from 'components/Onboarding/WelcomeModal'
 import AppRoutes from 'components/Routes/Routes'
 import SplashRoot from 'components/Splash/SplashRoot'
+import WelcomeModal from 'components/WelcomeModal/WelcomeModal'
 import { Content, Layout, Main } from 'cozy-ui/transpiled/react/Layout'
 import React, { useEffect } from 'react'
 import { useSelector } from 'react-redux'
diff --git a/src/components/Options/Accessibility/Accessibility.tsx b/src/components/Options/Accessibility/Accessibility.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..66a984ceffb1746fa1812c9b50e5270f0d2a2e35
--- /dev/null
+++ b/src/components/Options/Accessibility/Accessibility.tsx
@@ -0,0 +1,37 @@
+import Link from '@material-ui/core/Link'
+import AccessibilityIcon from 'assets/icons/ico/accessibility.svg'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import React from 'react'
+import '../GCU/gcuLink.scss'
+
+const Accessibility: React.FC = () => {
+  const { t } = useI18n()
+  return (
+    <div className="gcu-link-root">
+      <div className="gcu-link-content">
+        <Link
+          className="gcu-link-card-link"
+          href="https://ecolyo.com/accessibilite.html"
+        >
+          <div className="card optionCard">
+            <div className="gcu-link-card">
+              <div className="gcu-link-card-content">
+                <StyledIcon
+                  className="gcu-link-card-content-icon"
+                  icon={AccessibilityIcon}
+                  size={42}
+                />
+                <div className="gcu-link-card-content-title">
+                  {t('common.title_accessibility')}
+                </div>
+              </div>
+            </div>
+          </div>
+        </Link>
+      </div>
+    </div>
+  )
+}
+
+export default Accessibility
diff --git a/src/components/Options/exportOptions.spec.tsx b/src/components/Options/ExportData/ExportData.spec.tsx
similarity index 82%
rename from src/components/Options/exportOptions.spec.tsx
rename to src/components/Options/ExportData/ExportData.spec.tsx
index 360828b02ce15580dbe5257801d8dc2c1c2ca397..ef4cf3cf380dee33473741923879b06f45d33c6b 100644
--- a/src/components/Options/exportOptions.spec.tsx
+++ b/src/components/Options/ExportData/ExportData.spec.tsx
@@ -1,8 +1,9 @@
-import ExportOptions from 'components/Options/exportOptions'
 import { mount } from 'enzyme'
 import toJson from 'enzyme-to-json'
 import React from 'react'
-import mockClient from '../../../tests/__mocks__/client'
+import mockClient from '../../../../tests/__mocks__/client'
+
+import ExportData from './ExportData'
 
 jest.mock('cozy-ui/transpiled/react/I18n', () => {
   return {
@@ -33,7 +34,7 @@ jest.mock('cozy-client', () => ({
 
 describe('exportOptions component', () => {
   it('should be rendered correctly', async () => {
-    const wrapper = mount(<ExportOptions />)
+    const wrapper = mount(<ExportData />)
     expect(toJson(wrapper)).toMatchSnapshot()
   })
 })
diff --git a/src/components/Options/exportOptions.tsx b/src/components/Options/ExportData/ExportData.tsx
similarity index 95%
rename from src/components/Options/exportOptions.tsx
rename to src/components/Options/ExportData/ExportData.tsx
index bce44da306f943c2c4e16d72d8bd655a8827c573..1e9df7f5b87b0d8ecab95efd714cdc04c99a3fae 100644
--- a/src/components/Options/exportOptions.tsx
+++ b/src/components/Options/ExportData/ExportData.tsx
@@ -18,9 +18,9 @@ import { TimeStep } from 'enum/timeStep.enum'
 import { remove } from 'lodash'
 import React, { useEffect, useMemo, useState } from 'react'
 import ConsumptionDataManager from 'services/consumption.service'
-import './exportOptions.scss'
+import './exportData.scss'
 
-const ExportOptions: React.FC = () => {
+const ExportData: React.FC = () => {
   const { t } = useI18n()
   const client = useClient()
   const consumptionService = useMemo(
@@ -190,4 +190,4 @@ const ExportOptions: React.FC = () => {
   )
 }
 
-export default ExportOptions
+export default ExportData
diff --git a/src/components/Options/__snapshots__/exportOptions.spec.tsx.snap b/src/components/Options/ExportData/__snapshots__/ExportData.spec.tsx.snap
similarity index 99%
rename from src/components/Options/__snapshots__/exportOptions.spec.tsx.snap
rename to src/components/Options/ExportData/__snapshots__/ExportData.spec.tsx.snap
index aa4c3579151d165dc4d3cd7204c80e86598c680c..4e44f56f7bad8f699c0c34792f19317cce030178 100644
--- a/src/components/Options/__snapshots__/exportOptions.spec.tsx.snap
+++ b/src/components/Options/ExportData/__snapshots__/ExportData.spec.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`exportOptions component should be rendered correctly 1`] = `
-<ExportOptions>
+<ExportData>
   <div
     className="export-option-root"
   >
@@ -1180,5 +1180,5 @@ exports[`exportOptions component should be rendered correctly 1`] = `
       </ForwardRef(Dialog)>
     </WithStyles(ForwardRef(Dialog))>
   </ExportDoneModal>
-</ExportOptions>
+</ExportData>
 `;
diff --git a/src/components/Options/exportOptions.scss b/src/components/Options/ExportData/exportData.scss
similarity index 100%
rename from src/components/Options/exportOptions.scss
rename to src/components/Options/ExportData/exportData.scss
diff --git a/src/components/GCU/GCUContent.spec.tsx b/src/components/Options/GCU/GCUContent.spec.tsx
similarity index 89%
rename from src/components/GCU/GCUContent.spec.tsx
rename to src/components/Options/GCU/GCUContent.spec.tsx
index 8ec51c9d6fe7eae97ab70604d5e795e4ac9e2035..f7480cd76e1780e54a5cd5e26834b39939143397 100644
--- a/src/components/GCU/GCUContent.spec.tsx
+++ b/src/components/Options/GCU/GCUContent.spec.tsx
@@ -1,4 +1,4 @@
-import GCUContent from 'components/GCU/GCUContent'
+import GCUContent from 'components/Options/GCU/GCUContent'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/GCU/GCUContent.tsx b/src/components/Options/GCU/GCUContent.tsx
similarity index 100%
rename from src/components/GCU/GCUContent.tsx
rename to src/components/Options/GCU/GCUContent.tsx
diff --git a/src/components/GCU/GCULink.spec.tsx b/src/components/Options/GCU/GCULink.spec.tsx
similarity index 81%
rename from src/components/GCU/GCULink.spec.tsx
rename to src/components/Options/GCU/GCULink.spec.tsx
index 4c42fea3fc920c5f6ff944c3f734f7447c14d9a7..cf64c957da4db31d4223ace43ded22753cb9d094 100644
--- a/src/components/GCU/GCULink.spec.tsx
+++ b/src/components/Options/GCU/GCULink.spec.tsx
@@ -1,4 +1,4 @@
-import LegalNoticeLink from 'components/LegalNotice/LegalNoticeLink'
+import LegalNoticeLink from 'components/Options/LegalNotice/LegalNoticeLink'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/GCU/GCULink.tsx b/src/components/Options/GCU/GCULink.tsx
similarity index 88%
rename from src/components/GCU/GCULink.tsx
rename to src/components/Options/GCU/GCULink.tsx
index aca473ce3bd56bd2854cba291b6260b930dc2797..4e63440137a272037746f71d31212f1f39f529e8 100644
--- a/src/components/GCU/GCULink.tsx
+++ b/src/components/Options/GCU/GCULink.tsx
@@ -1,5 +1,5 @@
 import Link from '@material-ui/core/Link'
-import LegalNoticeIcon from 'assets/icons/ico/legal-notice.svg'
+import GCUIcon from 'assets/icons/ico/gcu.svg'
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import React from 'react'
@@ -21,7 +21,7 @@ const GCULink: React.FC = () => {
               <div className="gcu-link-card-content">
                 <StyledIcon
                   className="gcu-link-card-content-icon"
-                  icon={LegalNoticeIcon}
+                  icon={GCUIcon}
                   size={42}
                 />
                 <div className="gcu-link-card-content-title">
diff --git a/src/components/GCU/GCUView.spec.tsx b/src/components/Options/GCU/GCUView.spec.tsx
similarity index 86%
rename from src/components/GCU/GCUView.spec.tsx
rename to src/components/Options/GCU/GCUView.spec.tsx
index d548f1340524edf6e0a5957d1feea21b47e3fc7f..9692ba84bd47f3ade5d9474547d8139142f116fd 100644
--- a/src/components/GCU/GCUView.spec.tsx
+++ b/src/components/Options/GCU/GCUView.spec.tsx
@@ -1,4 +1,4 @@
-import GCUView from 'components/GCU/GCUView'
+import GCUView from 'components/Options/GCU/GCUView'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/GCU/GCUView.tsx b/src/components/Options/GCU/GCUView.tsx
similarity index 92%
rename from src/components/GCU/GCUView.tsx
rename to src/components/Options/GCU/GCUView.tsx
index 841c4832243bbc5836ba57800051df27e70a8229..49439dd79c4a4a105c69035967d3ccd8fd8d3730 100644
--- a/src/components/GCU/GCUView.tsx
+++ b/src/components/Options/GCU/GCUView.tsx
@@ -1,7 +1,7 @@
 import Content from 'components/Content/Content'
-import GCUContent from 'components/GCU/GCUContent'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
+import GCUContent from 'components/Options/GCU/GCUContent'
 import React, { useCallback, useState } from 'react'
 
 const GCUView: React.FC = () => {
diff --git a/src/components/GCU/__snapshots__/GCUContent.spec.tsx.snap b/src/components/Options/GCU/__snapshots__/GCUContent.spec.tsx.snap
similarity index 100%
rename from src/components/GCU/__snapshots__/GCUContent.spec.tsx.snap
rename to src/components/Options/GCU/__snapshots__/GCUContent.spec.tsx.snap
diff --git a/src/components/GCU/__snapshots__/GCULink.spec.tsx.snap b/src/components/Options/GCU/__snapshots__/GCULink.spec.tsx.snap
similarity index 100%
rename from src/components/GCU/__snapshots__/GCULink.spec.tsx.snap
rename to src/components/Options/GCU/__snapshots__/GCULink.spec.tsx.snap
diff --git a/src/components/GCU/__snapshots__/GCUView.spec.tsx.snap b/src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap
similarity index 100%
rename from src/components/GCU/__snapshots__/GCUView.spec.tsx.snap
rename to src/components/Options/GCU/__snapshots__/GCUView.spec.tsx.snap
diff --git a/src/components/GCU/gcuContent.scss b/src/components/Options/GCU/gcuContent.scss
similarity index 100%
rename from src/components/GCU/gcuContent.scss
rename to src/components/Options/GCU/gcuContent.scss
diff --git a/src/components/GCU/gcuLink.scss b/src/components/Options/GCU/gcuLink.scss
similarity index 100%
rename from src/components/GCU/gcuLink.scss
rename to src/components/Options/GCU/gcuLink.scss
diff --git a/src/components/LegalNotice/LegalNoticeContent.spec.tsx b/src/components/Options/LegalNotice/LegalNoticeContent.spec.tsx
similarity index 83%
rename from src/components/LegalNotice/LegalNoticeContent.spec.tsx
rename to src/components/Options/LegalNotice/LegalNoticeContent.spec.tsx
index e149a7c4324c91d9800f264733a4082674ade16b..ed6459952bfe193088413580e22590772e697415 100644
--- a/src/components/LegalNotice/LegalNoticeContent.spec.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeContent.spec.tsx
@@ -1,4 +1,4 @@
-import LegalNoticeContent from 'components/LegalNotice/LegalNoticeContent'
+import LegalNoticeContent from 'components/Options/LegalNotice/LegalNoticeContent'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/LegalNotice/LegalNoticeContent.tsx b/src/components/Options/LegalNotice/LegalNoticeContent.tsx
similarity index 100%
rename from src/components/LegalNotice/LegalNoticeContent.tsx
rename to src/components/Options/LegalNotice/LegalNoticeContent.tsx
diff --git a/src/components/LegalNotice/LegalNoticeLink.spec.tsx b/src/components/Options/LegalNotice/LegalNoticeLink.spec.tsx
similarity index 84%
rename from src/components/LegalNotice/LegalNoticeLink.spec.tsx
rename to src/components/Options/LegalNotice/LegalNoticeLink.spec.tsx
index 1a8ca9b8a57852fb3c1c5dc92fd7bc85c3bc0a7f..dcea071586f5b63f1e8e1dcdcfd9ee0e1956bcd6 100644
--- a/src/components/LegalNotice/LegalNoticeLink.spec.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeLink.spec.tsx
@@ -1,4 +1,4 @@
-import GCULink from 'components/GCU/GCULink'
+import GCULink from 'components/Options/GCU/GCULink'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/LegalNotice/LegalNoticeLink.tsx b/src/components/Options/LegalNotice/LegalNoticeLink.tsx
similarity index 100%
rename from src/components/LegalNotice/LegalNoticeLink.tsx
rename to src/components/Options/LegalNotice/LegalNoticeLink.tsx
diff --git a/src/components/LegalNotice/LegalNoticeView.spec.tsx b/src/components/Options/LegalNotice/LegalNoticeView.spec.tsx
similarity index 85%
rename from src/components/LegalNotice/LegalNoticeView.spec.tsx
rename to src/components/Options/LegalNotice/LegalNoticeView.spec.tsx
index 8495f6616ec675652a5e738893e56230401cf61a..247058c8f1f903f18a043784141abe544abc2c1b 100644
--- a/src/components/LegalNotice/LegalNoticeView.spec.tsx
+++ b/src/components/Options/LegalNotice/LegalNoticeView.spec.tsx
@@ -1,4 +1,4 @@
-import LegalNoticeView from 'components/LegalNotice/LegalNoticeView'
+import LegalNoticeView from 'components/Options/LegalNotice/LegalNoticeView'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/LegalNotice/LegalNoticeView.tsx b/src/components/Options/LegalNotice/LegalNoticeView.tsx
similarity index 100%
rename from src/components/LegalNotice/LegalNoticeView.tsx
rename to src/components/Options/LegalNotice/LegalNoticeView.tsx
diff --git a/src/components/LegalNotice/__snapshots__/LegalNoticeContent.spec.tsx.snap b/src/components/Options/LegalNotice/__snapshots__/LegalNoticeContent.spec.tsx.snap
similarity index 100%
rename from src/components/LegalNotice/__snapshots__/LegalNoticeContent.spec.tsx.snap
rename to src/components/Options/LegalNotice/__snapshots__/LegalNoticeContent.spec.tsx.snap
diff --git a/src/components/LegalNotice/__snapshots__/LegalNoticeLink.spec.tsx.snap b/src/components/Options/LegalNotice/__snapshots__/LegalNoticeLink.spec.tsx.snap
similarity index 100%
rename from src/components/LegalNotice/__snapshots__/LegalNoticeLink.spec.tsx.snap
rename to src/components/Options/LegalNotice/__snapshots__/LegalNoticeLink.spec.tsx.snap
diff --git a/src/components/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap b/src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
similarity index 100%
rename from src/components/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
rename to src/components/Options/LegalNotice/__snapshots__/LegalNoticeView.spec.tsx.snap
diff --git a/src/components/LegalNotice/legalNoticeLink.scss b/src/components/Options/LegalNotice/legalNoticeLink.scss
similarity index 100%
rename from src/components/LegalNotice/legalNoticeLink.scss
rename to src/components/Options/LegalNotice/legalNoticeLink.scss
diff --git a/src/components/LegalNotice/legalNoticeView.scss b/src/components/Options/LegalNotice/legalNoticeView.scss
similarity index 100%
rename from src/components/LegalNotice/legalNoticeView.scss
rename to src/components/Options/LegalNotice/legalNoticeView.scss
diff --git a/src/components/Options/OptionsView.tsx b/src/components/Options/OptionsView.tsx
index ed07406fddecb8a5d824206ac99975b8fa7bdffe..8fd37c74a2cfd4f320954aa00290beb25027ca9e 100644
--- a/src/components/Options/OptionsView.tsx
+++ b/src/components/Options/OptionsView.tsx
@@ -1,16 +1,17 @@
 import logos from 'assets/png/logos_partenaires.svg'
 import Content from 'components/Content/Content'
-import GCULink from 'components/GCU/GCULink'
 import CozyBar from 'components/Header/CozyBar'
 import Header from 'components/Header/Header'
-import LegalNoticeLink from 'components/LegalNotice/LegalNoticeLink'
-import ExportOptions from 'components/Options/exportOptions'
-import Version from 'components/Version/Version'
 import React, { useState } from 'react'
+import Accessibility from './Accessibility/Accessibility'
+import ExportData from './ExportData/ExportData'
+import GCULink from './GCU/GCULink'
 import HelpLink from './HelpLink/HelpLink'
+import LegalNoticeLink from './LegalNotice/LegalNoticeLink'
 import MatomoOptOut from './MatomoOptOut/MatomoOptOut'
 import ProfileTypeOptions from './ProfileTypeOptions/ProfileTypeOptions'
 import ReportOptions from './ReportOptions/ReportOptions'
+import Version from './Version/Version'
 
 const OptionsView: React.FC = () => {
   const [headerHeight, setHeaderHeight] = useState<number>(0)
@@ -27,11 +28,12 @@ const OptionsView: React.FC = () => {
       />
       <Content height={headerHeight}>
         <ProfileTypeOptions />
-        <ExportOptions />
+        <ExportData />
         <ReportOptions />
         <HelpLink />
         <LegalNoticeLink />
         <GCULink />
+        <Accessibility />
         <MatomoOptOut />
         <div className="parameters-logos">
           <img src={logos} alt="ensemble de logos" />
diff --git a/src/components/Version/Version.spec.tsx b/src/components/Options/Version/Version.spec.tsx
similarity index 81%
rename from src/components/Version/Version.spec.tsx
rename to src/components/Options/Version/Version.spec.tsx
index 62aa49fcdfd312b5c9b1f48ba4d42c5a71c64d3a..9165d73f9f35a54bc3904d362a722665e2480917 100644
--- a/src/components/Version/Version.spec.tsx
+++ b/src/components/Options/Version/Version.spec.tsx
@@ -1,4 +1,4 @@
-import Version from 'components/Version/Version'
+import Version from 'components/Options/Version/Version'
 import { shallow } from 'enzyme'
 import React from 'react'
 
diff --git a/src/components/Version/Version.tsx b/src/components/Options/Version/Version.tsx
similarity index 100%
rename from src/components/Version/Version.tsx
rename to src/components/Options/Version/Version.tsx
diff --git a/src/components/Version/__snapshots__/Version.spec.tsx.snap b/src/components/Options/Version/__snapshots__/Version.spec.tsx.snap
similarity index 100%
rename from src/components/Version/__snapshots__/Version.spec.tsx.snap
rename to src/components/Options/Version/__snapshots__/Version.spec.tsx.snap
diff --git a/src/components/Version/version.scss b/src/components/Options/Version/version.scss
similarity index 100%
rename from src/components/Version/version.scss
rename to src/components/Options/Version/version.scss
diff --git a/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap b/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
index 1fcb358c2fd2fdfedf95ab7a6e2f06504c83460f..7690e522649c43dadd5304904535270c4c2e1086 100644
--- a/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
+++ b/src/components/Options/__snapshots__/OptionsView.spec.tsx.snap
@@ -13,11 +13,12 @@ exports[`OptionsView component should be rendered correctly 1`] = `
     height={0}
   >
     <ProfileTypeOptions />
-    <ExportOptions />
+    <ExportData />
     <ReportOptions />
     <HelpLink />
     <LegalNoticeLink />
     <GCULink />
+    <Accessibility />
     <MatomoOptOut />
     <div
       className="parameters-logos"
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index fe430787e957e7098283a5c97bddf929df8f1f85..8d58879c674e5d00c5dfced6338f02d0133a7e10 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -23,9 +23,9 @@ const SingleEcogesture = lazy(
 )
 const OptionsView = lazy(() => import('components/Options/OptionsView'))
 const LegalNoticeView = lazy(
-  () => import('components/LegalNotice/LegalNoticeView')
+  () => import('components/Options/LegalNotice/LegalNoticeView')
 )
-const GCUView = lazy(() => import('components/GCU/GCUView'))
+const GCUView = lazy(() => import('components/Options/GCU/GCUView'))
 const AnalysisView = lazy(() => import('components/Analysis/AnalysisView'))
 const ProfileTypeView = lazy(
   () => import('components/ProfileType/ProfileTypeView')
diff --git a/src/components/Terms/CGUModal.tsx b/src/components/Terms/CGUModal.tsx
index 292c3eba0118c4df484ed1d248c618b67e560ac1..b3dfb6a58c68599f7601373cb89bb31cfbbe7c13 100644
--- a/src/components/Terms/CGUModal.tsx
+++ b/src/components/Terms/CGUModal.tsx
@@ -1,7 +1,7 @@
 import { Button, IconButton } from '@material-ui/core'
 import Dialog from '@material-ui/core/Dialog'
 import CloseIcon from 'assets/icons/ico/close.svg'
-import GCUContent from 'components/GCU/GCUContent'
+import GCUContent from 'components/Options/GCU/GCUContent'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import React from 'react'
diff --git a/src/components/Terms/LegalNoticeModal.tsx b/src/components/Terms/LegalNoticeModal.tsx
index 3811cf41d02122d568f75059627d3a67ef0b20bb..9f97244e52c7df19de85299ccb0ca67208116711 100644
--- a/src/components/Terms/LegalNoticeModal.tsx
+++ b/src/components/Terms/LegalNoticeModal.tsx
@@ -1,7 +1,7 @@
 import { Button, IconButton } from '@material-ui/core'
 import Dialog from '@material-ui/core/Dialog'
 import CloseIcon from 'assets/icons/ico/close.svg'
-import LegalNoticeContent from 'components/LegalNotice/LegalNoticeContent'
+import LegalNoticeContent from 'components/Options/LegalNotice/LegalNoticeContent'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import React from 'react'
diff --git a/src/components/Onboarding/WelcomeModal.spec.tsx b/src/components/WelcomeModal/WelcomeModal.spec.tsx
similarity index 100%
rename from src/components/Onboarding/WelcomeModal.spec.tsx
rename to src/components/WelcomeModal/WelcomeModal.spec.tsx
diff --git a/src/components/Onboarding/WelcomeModal.tsx b/src/components/WelcomeModal/WelcomeModal.tsx
similarity index 100%
rename from src/components/Onboarding/WelcomeModal.tsx
rename to src/components/WelcomeModal/WelcomeModal.tsx
diff --git a/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap b/src/components/WelcomeModal/__snapshots__/WelcomeModal.spec.tsx.snap
similarity index 100%
rename from src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
rename to src/components/WelcomeModal/__snapshots__/WelcomeModal.spec.tsx.snap
diff --git a/src/components/Onboarding/welcomeModal.scss b/src/components/WelcomeModal/welcomeModal.scss
similarity index 100%
rename from src/components/Onboarding/welcomeModal.scss
rename to src/components/WelcomeModal/welcomeModal.scss
diff --git a/src/locales/fr.json b/src/locales/fr.json
index a2d0a83331f8ab7b69c4031d04de6f35ed309567..6152e58bbd4ee9d5ba77e6a8729b2ed60c1c4d1f 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -15,6 +15,7 @@
     "title_profiletype": "Ajuster mon profil",
     "title_legal_notice": "Mentions légales",
     "title_gcu": "Conditions générales d’utilisation",
+    "title_accessibility": "Accessibilité : non conforme",
     "title_sge_connect": "Connexion à l'électricité",
     "accessibility": {
       "loading": "Chargement"