diff --git a/src/components/MailSuject/mailSubject.tsx b/src/components/MailSuject/mailSubject.tsx
index b60ee97ef69741f77e55c9e27b07dc896ad9b9a1..fe322b3e797e6a6ffe995dc9e942843de8f10343 100644
--- a/src/components/MailSuject/mailSubject.tsx
+++ b/src/components/MailSuject/mailSubject.tsx
@@ -1,5 +1,5 @@
 import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
+import { ContentItems } from '../Newsletter/Newsletter'
 import './mailSubject.scss'
 
 interface MailSubjectProps {
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index 7d7c146bfb054b64e141bb9487b150380f4c240a..c8ca2b97fadf34b7e4e6d77fc63bfcfa2cda4a84 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -6,7 +6,7 @@ interface ModalProps {
   classname?: string
 }
 
-const Modal: React.FC<ModalProps> = ({ children, classname }: ModalProps) => {
+const Modal: React.FC<ModalProps> = ({ children, classname }) => {
   return createPortal(
     <div className="modal-bg">
       <div className="modal-container">
diff --git a/src/components/MonthlyInfo/MonthlyInfo.tsx b/src/components/MonthlyInfo/MonthlyInfo.tsx
index c28c461fb2d95ace4a25d258b1df035b46c8af89..efaf357126ba2f17aec2dfb6c7568761345bf688 100644
--- a/src/components/MonthlyInfo/MonthlyInfo.tsx
+++ b/src/components/MonthlyInfo/MonthlyInfo.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
-import { ContentItems } from '../Editing/Editing'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
-import CustomEditor from '../Editing/CustomEditor'
 import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
-import './monthlyInfo.scss'
+import { convertStringToEditorState } from '../../utils/editorStateManagment'
 import ImagePicker from '../ImagePicker/ImagePicker'
+import CustomEditor from '../Newsletter/CustomEditor'
+import { ContentItems } from '../Newsletter/Newsletter'
+import './monthlyInfo.scss'
 interface MonthlyInfoProps {
   onSave: () => Promise<void>
   onCancel: () => void
diff --git a/src/components/MonthlyNews/MonthlyNews.tsx b/src/components/MonthlyNews/MonthlyNews.tsx
index 7699c52314d3bdcca1aa2ebf3053588b0becd6c5..ac2027209b3e12275e18532b814ebeb1200a87f2 100644
--- a/src/components/MonthlyNews/MonthlyNews.tsx
+++ b/src/components/MonthlyNews/MonthlyNews.tsx
@@ -1,8 +1,8 @@
 import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
-import CustomEditor from '../Editing/CustomEditor'
 import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
+import { convertStringToEditorState } from '../../utils/editorStateManagment'
+import CustomEditor from '../Newsletter/CustomEditor'
+import { ContentItems } from '../Newsletter/Newsletter'
 import './monthlyNews.scss'
 
 interface MonthlyNewsProps {
diff --git a/src/components/Editing/CustomEditor.tsx b/src/components/Newsletter/CustomEditor.tsx
similarity index 100%
rename from src/components/Editing/CustomEditor.tsx
rename to src/components/Newsletter/CustomEditor.tsx
diff --git a/src/components/Editing/CustomLink.tsx b/src/components/Newsletter/CustomLink.tsx
similarity index 100%
rename from src/components/Editing/CustomLink.tsx
rename to src/components/Newsletter/CustomLink.tsx
diff --git a/src/components/DateSelector/DateSelector.tsx b/src/components/Newsletter/DateSelector/DateSelector.tsx
similarity index 92%
rename from src/components/DateSelector/DateSelector.tsx
rename to src/components/Newsletter/DateSelector/DateSelector.tsx
index 0b501077fc401d01037d32c650ea37309fd3c3da..fd29f16e113c8f7172fc74ff7d0325a63cfb6d91 100644
--- a/src/components/DateSelector/DateSelector.tsx
+++ b/src/components/Newsletter/DateSelector/DateSelector.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
+import leftChevron from '../../../assets/icons/left-chevron.svg'
+import rightChevron from '../../../assets/icons/right-chevron.svg'
+import Modal from '../../Modal/Modal'
 import './dateSelector.scss'
-import leftChevron from '../../assets/icons/left-chevron.svg'
-import rightChevron from '../../assets/icons/right-chevron.svg'
-import Modal from '../Modal/Modal'
 
 interface DateSelectorProps {
   date: Date
diff --git a/src/components/DateSelector/dateSelector.scss b/src/components/Newsletter/DateSelector/dateSelector.scss
similarity index 86%
rename from src/components/DateSelector/dateSelector.scss
rename to src/components/Newsletter/DateSelector/dateSelector.scss
index 5d079413075a9e6fbacf55fc964571cb02b1baca..cb2a92c023ff94fb33b4dad892a1cb2d26f7ae5a 100644
--- a/src/components/DateSelector/dateSelector.scss
+++ b/src/components/Newsletter/DateSelector/dateSelector.scss
@@ -1,6 +1,7 @@
-@import '../../styles/config/colors';
-@import '../../styles/config/typography';
-@import '../../styles/config/breakpoints';
+@import 'src/styles/config/colors';
+@import 'src/styles/config/typography';
+@import 'src/styles/config/breakpoints';
+
 .date-selector {
   display: flex;
   align-items: center;
diff --git a/src/components/Editing/Editing.tsx b/src/components/Newsletter/Newsletter.tsx
similarity index 98%
rename from src/components/Editing/Editing.tsx
rename to src/components/Newsletter/Newsletter.tsx
index 12e9537931e334fe9d9eb711ec8a3655725b9c31..418da31bb3c920fe3f486da4dad3342e605c6bf0 100644
--- a/src/components/Editing/Editing.tsx
+++ b/src/components/Newsletter/Newsletter.tsx
@@ -5,21 +5,21 @@ import React, {
   useMemo,
   useState,
 } from 'react'
-import DateSelector from '../DateSelector/DateSelector'
-import { NewsletterService } from '../../services/newsletter.service'
+import { getAxiosXSRFHeader } from '../../axios.config'
 import { UserContext, UserContextProps } from '../../hooks/userContext'
-import { IMonthlyNews } from '../../models/monthlyNews.model'
+import { IMailSubject } from '../../models/mailSubject.model'
 import { IMonthlyInfo } from '../../models/monthlyInfo.model'
+import { IMonthlyNews } from '../../models/monthlyNews.model'
 import { IPoll } from '../../models/poll.model'
-import { IMailSubject } from '../../models/mailSubject.model'
+import { NewsletterService } from '../../services/newsletter.service'
+import Loader from '../Loader/Loader'
 import MailSubject from '../MailSuject/mailSubject'
-import Poll from '../Poll/Poll'
+import Modal from '../Modal/Modal'
 import MonthlyInfo from '../MonthlyInfo/MonthlyInfo'
 import MonthlyNews from '../MonthlyNews/MonthlyNews'
-import Loader from '../Loader/Loader'
-import Modal from '../Modal/Modal'
-import './editing.scss'
-import { getAxiosXSRFHeader } from '../../axios.config'
+import Poll from '../Poll/Poll'
+import DateSelector from './DateSelector/DateSelector'
+import './newsletter.scss'
 
 export type ContentItems =
   | 'monthlyInfo'
@@ -28,8 +28,8 @@ export type ContentItems =
   | 'subject'
   | ''
 
-const Editing: React.FC = () => {
-  // Fonctional rule :
+const Newsletter: React.FC = () => {
+  // Functional rule :
   // Display next month after the 3rd of the current month
   const getCurrentNewsletterDate = (): Date => {
     const newsletterDate = new Date()
@@ -354,4 +354,4 @@ const Editing: React.FC = () => {
   )
 }
 
-export default Editing
+export default Newsletter
diff --git a/src/components/Editing/customEditor.scss b/src/components/Newsletter/customEditor.scss
similarity index 100%
rename from src/components/Editing/customEditor.scss
rename to src/components/Newsletter/customEditor.scss
diff --git a/src/components/Editing/editing.scss b/src/components/Newsletter/newsletter.scss
similarity index 100%
rename from src/components/Editing/editing.scss
rename to src/components/Newsletter/newsletter.scss
diff --git a/src/components/Poll/Poll.tsx b/src/components/Poll/Poll.tsx
index d8df0bf0c6c08b4386cb788674e16cc5b043dc2d..976da9116e5f2b22182fa5819423b007638fe219 100644
--- a/src/components/Poll/Poll.tsx
+++ b/src/components/Poll/Poll.tsx
@@ -1,8 +1,8 @@
 import React, { ChangeEvent } from 'react'
-import { ContentItems } from '../Editing/Editing'
-import CustomEditor from '../Editing/CustomEditor'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
 import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
+import { convertStringToEditorState } from '../../utils/editorStateManagment'
+import CustomEditor from '../Newsletter/CustomEditor'
+import { ContentItems } from '../Newsletter/Newsletter'
 import './poll.scss'
 
 interface PollProps {
diff --git a/src/components/Settings/Settings.tsx b/src/components/Popups/Popups.tsx
similarity index 99%
rename from src/components/Settings/Settings.tsx
rename to src/components/Popups/Popups.tsx
index 91101a3fda14c0b8f34c104aff09b6a23949d8c5..24628c28a8faef517f1a7f57d53ca5e9b6a4b79d 100644
--- a/src/components/Settings/Settings.tsx
+++ b/src/components/Popups/Popups.tsx
@@ -6,15 +6,15 @@ import { CheckboxType } from '../../enum/checkboxType.enum'
 import { UserContext, UserContextProps } from '../../hooks/userContext'
 import { ICustomPopup, PopupDuration } from '../../models/cutomPopup.model'
 import {
+  Option,
   durationEnum,
   durationType,
-  Option,
 } from '../../models/durationOptios.model'
 import { IPartnersInfo } from '../../models/partnersInfo.model'
 import { CustomPopupService } from '../../services/customPopup.service'
 import { PartnersInfoService } from '../../services/partnersInfo.service'
 import Loader from '../Loader/Loader'
-import './settings.scss'
+import './popups.scss'
 
 const OPTIONS: Array<Option> = [
   {
@@ -31,7 +31,7 @@ const OPTIONS: Array<Option> = [
   },
 ]
 
-const Settings: React.FC = () => {
+const Popups: React.FC = () => {
   const [refreshData, setRefreshData] = useState(false)
   const [isLoading, setIsLoading] = useState(false)
   const [partnersInfo, setPartnersInfo] = useState<IPartnersInfo>({
@@ -231,7 +231,7 @@ const Settings: React.FC = () => {
         <p className="title pagetitle">Paramètres de l&apos;appli</p>
       </div>
 
-      <div className="content settings">
+      <div className="content popups">
         {isLoading && <Loader />}
         {!isLoading && (
           <>
@@ -403,4 +403,4 @@ const Settings: React.FC = () => {
   )
 }
 
-export default Settings
+export default Popups
diff --git a/src/components/Settings/settings.scss b/src/components/Popups/popups.scss
similarity index 99%
rename from src/components/Settings/settings.scss
rename to src/components/Popups/popups.scss
index 9510c5271563b028768526719676a20c87494208..2c2400fb373242e9f192be44159541ed0284ab54 100644
--- a/src/components/Settings/settings.scss
+++ b/src/components/Popups/popups.scss
@@ -1,6 +1,6 @@
 @import '../../styles/config/colors';
 
-.settings {
+.popupsÃ’ {
   .disabled {
     opacity: 0.5;
   }
diff --git a/src/components/Routes/Router.tsx b/src/components/Routes/Router.tsx
index cbf8b0f6e7edc1180b56b351167f260cf6a25be5..0155cdde08c1aed7244033703bb8b0174da574f4 100644
--- a/src/components/Routes/Router.tsx
+++ b/src/components/Routes/Router.tsx
@@ -2,10 +2,10 @@ import React, { useContext } from 'react'
 import { Redirect, Route, Switch } from 'react-router-dom'
 import { UserContext } from '../../hooks/userContext'
 import Consents from '../Consents/Consents'
-import Editing from '../Editing/Editing'
 import Login from '../Login/Login'
+import Newsletter from '../Newsletter/Newsletter'
+import Popups from '../Popups/Popups'
 import Prices from '../Prices/Prices'
-import Settings from '../Settings/Settings'
 
 const links: { [key: string]: { label: string; path: string } } = {
   newsletter: {
@@ -38,9 +38,9 @@ const Router: React.FC = () => {
     <Switch>
       {user ? (
         <>
-          <Route exact path={links.newsletter.path} component={Editing} />
+          <Route exact path={links.newsletter.path} component={Newsletter} />
           <Route exact path={links.prices.path} component={Prices} />
-          <Route exact path={links.popups.path} component={Settings} />
+          <Route exact path={links.popups.path} component={Popups} />
           <Route exact path={links.consents.path} component={Consents} />
           <Redirect path="*" to={links.newsletter.path} />
         </>