diff --git a/src/core/App.tsx b/src/App.tsx
similarity index 88%
rename from src/core/App.tsx
rename to src/App.tsx
index 00d70f3d25ef7e15a784a3c7624c98e35d417e5e..a978a397aa92b22dae21056f577d9d6bf5431ab2 100644
--- a/src/core/App.tsx
+++ b/src/App.tsx
@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import styled from 'styled-components';
-import useAddNews from '../hooks/useAddNews';
 import Footer from './components/Footer';
 import Header from './components/Header';
-import MainRouting from './components/MainRouting';
 import { UserStateProvider } from './context/UserContext';
+import useAddNews from './hooks/useAddNews';
+import Routes from './Routes';
 
 const Container = styled.div`
   height: 100%;
@@ -37,7 +37,7 @@ function App(): React.ReactElement {
         <Container>
           <Header />
           <MainContent>
-            <MainRouting />
+            <Routes />
           </MainContent>
           <Footer />
         </Container>
diff --git a/src/core/components/MainRouting.tsx b/src/Routes.tsx
similarity index 57%
rename from src/core/components/MainRouting.tsx
rename to src/Routes.tsx
index 9de8dc4fc746809f74605ce33ed7d102431cab33..d11cc5a1c8fa2dfad2f9f9b6dafee1d2d54aae3e 100644
--- a/src/core/components/MainRouting.tsx
+++ b/src/Routes.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import NewsPage from '../../components/NewsPage';
-import ProfileButton from './ProfileButton';
+import ProfileButton from './components/ProfileButton';
+import NewsPage from './pages/NewsPage';
 
-const MainRouting: React.FC = () => (
+const Routes: React.FC = () => (
   <Switch>
     <Route path="/" exact>
       <ProfileButton />
@@ -14,4 +14,4 @@ const MainRouting: React.FC = () => (
   </Switch>
 );
 
-export default MainRouting;
+export default Routes;
diff --git a/src/core/components/CustomModal.tsx b/src/components/CustomModal.tsx
similarity index 100%
rename from src/core/components/CustomModal.tsx
rename to src/components/CustomModal.tsx
diff --git a/src/core/components/Footer.tsx b/src/components/Footer.tsx
similarity index 100%
rename from src/core/components/Footer.tsx
rename to src/components/Footer.tsx
diff --git a/src/core/components/Header.tsx b/src/components/Header.tsx
similarity index 100%
rename from src/core/components/Header.tsx
rename to src/components/Header.tsx
diff --git a/src/core/components/ProfileButton.tsx b/src/components/ProfileButton.tsx
similarity index 100%
rename from src/core/components/ProfileButton.tsx
rename to src/components/ProfileButton.tsx
diff --git a/src/core/components/ProfileModal.tsx b/src/components/ProfileModal.tsx
similarity index 100%
rename from src/core/components/ProfileModal.tsx
rename to src/components/ProfileModal.tsx
diff --git a/src/core/context/UserContext.tsx b/src/context/UserContext.tsx
similarity index 93%
rename from src/core/context/UserContext.tsx
rename to src/context/UserContext.tsx
index 0c8730888f2d7442b21a156755c96ab92c60975d..4a9de33994518c115aacba0dce7c0ef423fb07ac 100644
--- a/src/core/context/UserContext.tsx
+++ b/src/context/UserContext.tsx
@@ -1,5 +1,5 @@
 import React, { createContext, useState } from 'react';
-import { Profile, Role } from '../types';
+import { Profile, Role } from '../types/types';
 
 interface ContextProps {
   profile: Profile;
diff --git a/src/hooks/useAddNews.ts b/src/hooks/useAddNews.ts
index 51d2eb199c2749d2cbdf945825a17b80f0de649b..240921f1cbdf2cd1ee4a4221d6fa84129e499d6c 100644
--- a/src/hooks/useAddNews.ts
+++ b/src/hooks/useAddNews.ts
@@ -1,4 +1,4 @@
-import { News } from '../core/types';
+import { News } from '../types/types';
 import useRequest from './useRequest';
 import useRestQueries from './useRestQueries';
 
diff --git a/src/hooks/useGetNewsList.ts b/src/hooks/useGetNewsList.ts
index 850572353916fa2cc58ba0ab293c4b32e50c4fc7..d129df721b72f138d455ab522332527346a65234 100644
--- a/src/hooks/useGetNewsList.ts
+++ b/src/hooks/useGetNewsList.ts
@@ -1,4 +1,4 @@
-import { News } from '../core/types';
+import { News } from '../types/types';
 import useRequest from './useRequest';
 import useRestQueries from './useRestQueries';
 
diff --git a/src/index.tsx b/src/index.tsx
index 65d5ef9d6423481dfe5b8633ff9e592cee535581..57a536ca7c3661c785a033ce7226c025c1bc210c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './core/App';
+import App from './App';
 import './index.css';
 import * as serviceWorker from './serviceWorker';
 
diff --git a/src/components/NewsPage.tsx b/src/pages/NewsPage.tsx
similarity index 76%
rename from src/components/NewsPage.tsx
rename to src/pages/NewsPage.tsx
index 82b744c859b836b9467d60e5eab4a9ec08cf1306..e9b9732df9de22407b60d45e60d9a0540967e49f 100644
--- a/src/components/NewsPage.tsx
+++ b/src/pages/NewsPage.tsx
@@ -1,6 +1,6 @@
 import { Container } from '@material-ui/core';
 import React from 'react';
-import NewsContainer from './NewsContainer';
+import NewsContainer from '../components/NewsContainer';
 
 const NewsPage: React.FC = () => (
   <Container>
diff --git a/src/core/types.ts b/src/types/types.ts
similarity index 100%
rename from src/core/types.ts
rename to src/types/types.ts