diff --git a/src/App/App.js b/src/App/App.js
index 2eb126d71..b08c46306 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -1,5 +1,5 @@
 const React = require('react');
-const { Router } = require('stremio-common');
+const { Router } = require('stremio-navigation');
 const routerViewsConfig = require('./routerViewsConfig');
 const styles = require('./styles');
 
diff --git a/src/common/Modal/ModalsContainerProvider/index.js b/src/common/Modal/ModalsContainerProvider/index.js
deleted file mode 100644
index 08bee35a3..000000000
--- a/src/common/Modal/ModalsContainerProvider/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const ModalsContainerProvider = require('./ModalsContainerProvider');
-
-module.exports = ModalsContainerProvider;
diff --git a/src/common/Popup/index.js b/src/common/Popup/index.js
deleted file mode 100644
index f0e0f8d6d..000000000
--- a/src/common/Popup/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Popup from './Popup';
-
-export default Popup;
diff --git a/src/common/Router/Route/index.js b/src/common/Router/Route/index.js
deleted file mode 100644
index c23450959..000000000
--- a/src/common/Router/Route/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const Route = require('./Route');
-
-module.exports = Route;
diff --git a/src/common/index.js b/src/common/index.js
index bacae8d21..76f750007 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -1,32 +1,19 @@
-import Slider from './Slider';
-import { FocusableProvider, withFocusable } from './Focusable';
-import Checkbox from './Checkbox';
-import ColorPicker from './ColorPicker';
-import Input from './Input';
-import { Modal, ModalsContainerContext, withModalsContainer } from './Modal';
-import Popup from './Popup';
-import Router from './Router';
-import NavBar from './NavBar';
-import MetaItem from './MetaItem';
-import ShareModal from './ShareModal';
-import UserPanel from './UserPanel';
-import Loader from './Loader';
+const Checkbox = require('./Checkbox');
+const ColorPicker = require('./ColorPicker');
+const Loader = require('./Loader');
+const MetaItem = require('./MetaItem');
+const NavBar = require('./NavBar');
+const ShareModal = require('./ShareModal');
+const Slider = require('./Slider');
+const UserPanel = require('./UserPanel');
 
-export {
+module.exports = {
     Checkbox,
     ColorPicker,
-    Input,
-    Popup,
-    NavBar,
-    ModalsContainerContext,
-    Modal,
-    withModalsContainer,
-    Router,
-    MetaItem,
-    ShareModal,
-    UserPanel,
     Loader,
+    MetaItem,
+    NavBar,
+    ShareModal,
     Slider,
-    FocusableProvider,
-    withFocusable
+    UserPanel
 };
diff --git a/src/common/Focusable/FocusableContext.js b/src/navigation/FocusableContext/FocusableContext.js
similarity index 100%
rename from src/common/Focusable/FocusableContext.js
rename to src/navigation/FocusableContext/FocusableContext.js
diff --git a/src/common/Focusable/FocusableProvider.js b/src/navigation/FocusableContext/FocusableProvider.js
similarity index 97%
rename from src/common/Focusable/FocusableProvider.js
rename to src/navigation/FocusableContext/FocusableProvider.js
index df1eab16e..988376ccf 100644
--- a/src/common/Focusable/FocusableProvider.js
+++ b/src/navigation/FocusableContext/FocusableProvider.js
@@ -1,6 +1,6 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-const withModalsContainer = require('../Modal/withModalsContainer');
+const { withModalsContainer } = require('../ModalsContainerContext');
 const FocusableContext = require('./FocusableContext');
 
 class FocusableProvider extends React.Component {
diff --git a/src/common/Focusable/index.js b/src/navigation/FocusableContext/index.js
similarity index 100%
rename from src/common/Focusable/index.js
rename to src/navigation/FocusableContext/index.js
diff --git a/src/common/Focusable/withFocusable.js b/src/navigation/FocusableContext/withFocusable.js
similarity index 100%
rename from src/common/Focusable/withFocusable.js
rename to src/navigation/FocusableContext/withFocusable.js
diff --git a/src/common/Input/Input.js b/src/navigation/Input/Input.js
similarity index 97%
rename from src/common/Input/Input.js
rename to src/navigation/Input/Input.js
index b45d16f2a..49d79383a 100644
--- a/src/common/Input/Input.js
+++ b/src/navigation/Input/Input.js
@@ -1,6 +1,6 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-const withFocusable = require('../Focusable/withFocusable');
+const { withFocusable } = require('../FocusableContext');
 
 const ENTER_KEY_CODE = 13;
 const BUTTON_INPUT_TYPES = ['button', 'link', 'submit', 'checkbox'];
diff --git a/src/common/Input/index.js b/src/navigation/Input/index.js
similarity index 100%
rename from src/common/Input/index.js
rename to src/navigation/Input/index.js
diff --git a/src/common/Modal/Modal.js b/src/navigation/Modal/Modal.js
similarity index 86%
rename from src/common/Modal/Modal.js
rename to src/navigation/Modal/Modal.js
index 1b305f947..704a463ac 100644
--- a/src/common/Modal/Modal.js
+++ b/src/navigation/Modal/Modal.js
@@ -1,8 +1,8 @@
 const React = require('react');
 const ReactDOM = require('react-dom');
 const PropTypes = require('prop-types');
-const FocusableProvider = require('../Focusable/FocusableProvider');
-const withModalsContainer = require('./withModalsContainer');
+const { FocusableProvider } = require('../FocusableContext');
+const { withModalsContainer } = require('../ModalsContainerContext');
 
 const onModalsContainerDomTreeChange = ({ modalsContainerElement, contentElement }) => {
     return modalsContainerElement.lastElementChild === contentElement;
diff --git a/src/navigation/Modal/index.js b/src/navigation/Modal/index.js
new file mode 100644
index 000000000..1327d76d6
--- /dev/null
+++ b/src/navigation/Modal/index.js
@@ -0,0 +1,3 @@
+const Modal = require('./Modal');
+
+module.exports = Modal;
diff --git a/src/common/Modal/ModalsContainerContext.js b/src/navigation/ModalsContainerContext/ModalsContainerContext.js
similarity index 100%
rename from src/common/Modal/ModalsContainerContext.js
rename to src/navigation/ModalsContainerContext/ModalsContainerContext.js
diff --git a/src/common/Modal/ModalsContainerProvider/ModalsContainerProvider.js b/src/navigation/ModalsContainerContext/ModalsContainerProvider.js
similarity index 93%
rename from src/common/Modal/ModalsContainerProvider/ModalsContainerProvider.js
rename to src/navigation/ModalsContainerContext/ModalsContainerProvider.js
index d357855bd..4d9c68ee7 100644
--- a/src/common/Modal/ModalsContainerProvider/ModalsContainerProvider.js
+++ b/src/navigation/ModalsContainerContext/ModalsContainerProvider.js
@@ -1,5 +1,5 @@
 const React = require('react');
-const ModalsContainerContext = require('../ModalsContainerContext');
+const ModalsContainerContext = require('./ModalsContainerContext');
 const styles = require('./styles');
 
 class ModalsContainerProvider extends React.Component {
diff --git a/src/common/Modal/index.js b/src/navigation/ModalsContainerContext/index.js
similarity index 54%
rename from src/common/Modal/index.js
rename to src/navigation/ModalsContainerContext/index.js
index c6b771301..d3acd7704 100644
--- a/src/common/Modal/index.js
+++ b/src/navigation/ModalsContainerContext/index.js
@@ -1,11 +1,7 @@
-const Modal = require('./Modal');
-const ModalsContainerContext = require('./ModalsContainerContext');
-const ModalsContainerProvider = require('./ModalsContainerProvider/ModalsContainerProvider');
+const ModalsContainerProvider = require('./ModalsContainerProvider');
 const withModalsContainer = require('./withModalsContainer');
 
 module.exports = {
-    Modal,
-    ModalsContainerContext,
     ModalsContainerProvider,
     withModalsContainer
 };
diff --git a/src/common/Modal/ModalsContainerProvider/styles.less b/src/navigation/ModalsContainerContext/styles.less
similarity index 100%
rename from src/common/Modal/ModalsContainerProvider/styles.less
rename to src/navigation/ModalsContainerContext/styles.less
diff --git a/src/common/Modal/withModalsContainer.js b/src/navigation/ModalsContainerContext/withModalsContainer.js
similarity index 100%
rename from src/common/Modal/withModalsContainer.js
rename to src/navigation/ModalsContainerContext/withModalsContainer.js
diff --git a/src/common/Popup/Label.js b/src/navigation/Popup/Label.js
similarity index 77%
rename from src/common/Popup/Label.js
rename to src/navigation/Popup/Label.js
index b4a7a1849..f37923013 100644
--- a/src/common/Popup/Label.js
+++ b/src/navigation/Popup/Label.js
@@ -1,4 +1,4 @@
-import React from 'react';
+const React = require('react');
 
 const Label = React.forwardRef(({ children, ...props }, ref) => {
     return React.cloneElement(React.Children.only(children), { ...props, ref });
@@ -6,4 +6,4 @@ const Label = React.forwardRef(({ children, ...props }, ref) => {
 
 Label.displayName = 'Popup.Label';
 
-export default Label;
+module.exports = Label;
diff --git a/src/common/Popup/Menu.js b/src/navigation/Popup/Menu.js
similarity index 72%
rename from src/common/Popup/Menu.js
rename to src/navigation/Popup/Menu.js
index 26d3ce9e4..e791c8e88 100644
--- a/src/common/Popup/Menu.js
+++ b/src/navigation/Popup/Menu.js
@@ -1,4 +1,4 @@
-import React from 'react';
+const React = require('react');
 
 const Menu = React.forwardRef(({ children }, ref) => (
     <div ref={ref}>
@@ -8,4 +8,4 @@ const Menu = React.forwardRef(({ children }, ref) => (
 
 Menu.displayName = 'Popup.Menu';
 
-export default Menu;
+module.exports = Menu;
diff --git a/src/common/Popup/Popup.js b/src/navigation/Popup/Popup.js
similarity index 97%
rename from src/common/Popup/Popup.js
rename to src/navigation/Popup/Popup.js
index 1354b98b2..79663af3f 100644
--- a/src/common/Popup/Popup.js
+++ b/src/navigation/Popup/Popup.js
@@ -1,12 +1,12 @@
-import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { Modal } from 'stremio-common';
-import Label from './Label';
-import Menu from './Menu';
-import styles from './styles';
+const React = require('react');
+const PropTypes = require('prop-types');
+const classnames = require('classnames');
+const Modal = require('../Modal');
+const Label = require('./Label');
+const Menu = require('./Menu');
+const styles = require('./styles');
 
-class Popup extends Component {
+class Popup extends React.Component {
     constructor(props) {
         super(props);
 
@@ -276,10 +276,10 @@ class Popup extends Component {
         }
 
         return (
-            <Fragment>
+            <React.Fragment>
                 {this.renderLabel(this.props.children[0])}
                 {this.renderMenu(this.props.children[1])}
-            </Fragment>
+            </React.Fragment>
         );
     }
 }
@@ -293,4 +293,4 @@ Popup.propTypes = {
     onClose: PropTypes.func
 };
 
-export default Popup;
+module.exports = Popup;
diff --git a/src/navigation/Popup/index.js b/src/navigation/Popup/index.js
new file mode 100644
index 000000000..f42bc94e6
--- /dev/null
+++ b/src/navigation/Popup/index.js
@@ -0,0 +1,3 @@
+const Popup = require('./Popup');
+
+module.exports = Popup;
diff --git a/src/common/Popup/styles.less b/src/navigation/Popup/styles.less
similarity index 100%
rename from src/common/Popup/styles.less
rename to src/navigation/Popup/styles.less
diff --git a/src/common/Router/Route/Route.js b/src/navigation/Router/Route.js
similarity index 80%
rename from src/common/Router/Route/Route.js
rename to src/navigation/Router/Route.js
index 2a89948c6..695e4eac7 100644
--- a/src/common/Router/Route/Route.js
+++ b/src/navigation/Router/Route.js
@@ -1,6 +1,6 @@
 const React = require('react');
-const FocusableProvider = require('../../Focusable/FocusableProvider');
-const ModalsContainerProvider = require('../../Modal/ModalsContainerProvider');
+const { FocusableProvider } = require('../FocusableContext');
+const { ModalsContainerProvider } = require('../ModalsContainerContext');
 const styles = require('./styles');
 
 const onModalsContainerDomTreeChange = ({ modalsContainerElement }) => {
diff --git a/src/common/Router/Router.js b/src/navigation/Router/Router.js
similarity index 100%
rename from src/common/Router/Router.js
rename to src/navigation/Router/Router.js
diff --git a/src/common/Router/index.js b/src/navigation/Router/index.js
similarity index 100%
rename from src/common/Router/index.js
rename to src/navigation/Router/index.js
diff --git a/src/common/Router/Route/styles.less b/src/navigation/Router/styles.less
similarity index 100%
rename from src/common/Router/Route/styles.less
rename to src/navigation/Router/styles.less
diff --git a/src/navigation/index.js b/src/navigation/index.js
new file mode 100644
index 000000000..ff151ab8d
--- /dev/null
+++ b/src/navigation/index.js
@@ -0,0 +1,11 @@
+const Input = require('./Input');
+const Modal = require('./Modal');
+const Popup = require('./Popup');
+const Router = require('./Router');
+
+module.exports = {
+    Input,
+    Modal,
+    Popup,
+    Router
+};
diff --git a/webpack.config.js b/webpack.config.js
index 2450b725a..776441513 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -74,7 +74,8 @@ module.exports = {
         alias: {
             'stremio-common': path.resolve(__dirname, 'src/common'),
             'stremio-routes': path.resolve(__dirname, 'src/routes'),
-            'stremio-services': path.resolve(__dirname, 'src/services')
+            'stremio-services': path.resolve(__dirname, 'src/services'),
+            'stremio-navigation': path.resolve(__dirname, 'src/navigation')
         }
     },
     devServer: {