diff --git a/src/common/MainVerticalNavBar/MainVerticalNavBar.js b/src/common/MainVerticalNavBar/MainVerticalNavBar.js
index 350f40e6c..d3b1396dc 100644
--- a/src/common/MainVerticalNavBar/MainVerticalNavBar.js
+++ b/src/common/MainVerticalNavBar/MainVerticalNavBar.js
@@ -1,6 +1,6 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-const VerticalNavBar = require('stremio/common/VerticalNavBar');
+const { VerticalNavBar } = require('stremio/common/NavBar');
 
 const TABS = [
     { route: 'board', label: 'Board', icon: 'ic_board', href: '#/' },
diff --git a/src/common/VerticalNavBar/VerticalNavBar.js b/src/common/NavBar/VerticalNavBar/VerticalNavBar.js
similarity index 100%
rename from src/common/VerticalNavBar/VerticalNavBar.js
rename to src/common/NavBar/VerticalNavBar/VerticalNavBar.js
diff --git a/src/common/VerticalNavBar/index.js b/src/common/NavBar/VerticalNavBar/index.js
similarity index 100%
rename from src/common/VerticalNavBar/index.js
rename to src/common/NavBar/VerticalNavBar/index.js
diff --git a/src/common/VerticalNavBar/styles.less b/src/common/NavBar/VerticalNavBar/styles.less
similarity index 100%
rename from src/common/VerticalNavBar/styles.less
rename to src/common/NavBar/VerticalNavBar/styles.less
diff --git a/src/common/NavBar/index.js b/src/common/NavBar/index.js
index 604868803..b09d6c6da 100644
--- a/src/common/NavBar/index.js
+++ b/src/common/NavBar/index.js
@@ -1,3 +1,5 @@
-const NavBar = require('./NavBar');
+const VerticalNavBar = require('./VerticalNavBar');
 
-module.exports = NavBar;
+module.exports = {
+    VerticalNavBar
+};
diff --git a/src/common/index.js b/src/common/index.js
index 8a6238adb..eeb52abc6 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -10,7 +10,7 @@ const MetaPreview = require('./MetaPreview');
 const MetaRow = require('./MetaRow');
 const ModalDialog = require('./ModalDialog');
 const Multiselect = require('./Multiselect');
-const NavBar = require('./NavBar');
+const { VerticalNavBar } = require('./NavBar');
 const PaginationInput = require('./PaginationInput');
 const PlayIconCircleCentered = require('./PlayIconCircleCentered');
 const Popup = require('./Popup');
@@ -43,7 +43,7 @@ module.exports = {
     MetaRow,
     ModalDialog,
     Multiselect,
-    NavBar,
+    VerticalNavBar,
     PaginationInput,
     PlayIconCircleCentered,
     Popup,