diff --git a/packages/play-node-go/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.js b/packages/play-node-go/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.js
index 215e86a..44f8750 100644
--- a/packages/play-node-go/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.js
+++ b/packages/play-node-go/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.js
@@ -3,11 +3,11 @@ import './MainWrapper.scss';
 
 import NavBar from '../NavBar/NavBar';
 import Sidebar from '../Sidebar/Sidebar';
-import Account from '../../pages/Account/Account';
-import Game from '../../pages/Game/Game';
-import Home from '../../pages/Home/Home';
-import News from '../../pages/News/News';
-import Room from '../../pages/Room/Room';
+import Account from '../../Account/Account';
+import Game from '../../Game/Game';
+import Home from '../../Home/Home';
+import News from '../../News/News';
+import Room from '../../Room/Room';
 
 const MainWrapper = (props) => {
 
diff --git a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
index 015a090..9eb8dc2 100644
--- a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import './NavBar.scss';
-import Logo from '../Logo/Logo';
+import Logo from '../../../components/Logo/Logo';
 
 const NavBar = (props) => {
 
diff --git a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.test.js b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.test.js
index 4d2478c..874f914 100644
--- a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.test.js
+++ b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { render } from '@testing-library/react';
 import NavBar from './NavBar';
-import { initState } from '../../reducers/init/stateReducer.init';
+import { initState } from '../../../reducers/init/stateReducer.init';
 
 test('renders NavBar without crashing', () => {
   const { getByTestId } = render(
diff --git a/packages/play-node-go/play-node-go/src/pages/Layout/Sidebar/Sidebar.js b/packages/play-node-go/play-node-go/src/pages/Layout/Sidebar/Sidebar.js
index 8fd7bbd..ba2cb5d 100644
--- a/packages/play-node-go/play-node-go/src/pages/Layout/Sidebar/Sidebar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Layout/Sidebar/Sidebar.js
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import './Sidebar.scss';
 
-import AccountSidebar from '../../pages/Account/AccountSidebar';
-import HomeSidebar from '../../pages/Home/HomeSidebar';
-import NewsSidebar from '../../pages/News/NewsSidebar';
-import RoomSidebar from '../../pages/Room/RoomSidebar';
+import AccountSidebar from '../../Account/AccountSidebar';
+import HomeSidebar from '../../Home/HomeSidebar';
+import NewsSidebar from '../../News/NewsSidebar';
+import RoomSidebar from '../../Room/RoomSidebar';
 
 const Sidebar = (props) => {