diff --git a/src/App/routerViewsConfig.js b/src/App/routerViewsConfig.js
index 1e807edc9..57a231741 100644
--- a/src/App/routerViewsConfig.js
+++ b/src/App/routerViewsConfig.js
@@ -1,5 +1,5 @@
-const { Addons, Board, Calendar, Detail, Discover, Intro, Library, Player, Search, Settings } = require('stremio-routes');
-const { routesRegexp } = require('stremio-common');
+const { Addons, Board, Calendar, Detail, Discover, Intro, Library, Player, Search, Settings } = require('stremio/routes');
+const { routesRegexp } = require('stremio/common');
 
 const routerViewsConfig = [
     [
diff --git a/src/common/ShareModal/ShareModal.js b/src/common/ShareModal/ShareModal.js
index f69c8828e..afb6f1d38 100644
--- a/src/common/ShareModal/ShareModal.js
+++ b/src/common/ShareModal/ShareModal.js
@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { Input, Modal } from 'stremio-common';
+import { Input, Modal } from 'stremio/common';
 import Icon from 'stremio-icons/dom';
 import styles from './styles';
 
diff --git a/src/routes/Addons/InstallAddonDialog/InstallAddonDialog.js b/src/routes/Addons/InstallAddonDialog/InstallAddonDialog.js
index 141294636..bd0e84e2c 100644
--- a/src/routes/Addons/InstallAddonDialog/InstallAddonDialog.js
+++ b/src/routes/Addons/InstallAddonDialog/InstallAddonDialog.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { Input } from 'stremio-common';
+import { Input } from 'stremio/common';
 import Icon from 'stremio-icons/dom';
 import styles from './styles';
 
diff --git a/src/routes/Calendar/Calendar.js b/src/routes/Calendar/Calendar.js
index c370ca2a5..5ac3e1443 100644
--- a/src/routes/Calendar/Calendar.js
+++ b/src/routes/Calendar/Calendar.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { Input } from 'stremio-common';
+import { Input } from 'stremio/common';
 import Icon from 'stremio-icons/dom';
 import styles from './styles';
 
diff --git a/src/routes/Detail/VideosList/VideosList.js b/src/routes/Detail/VideosList/VideosList.js
index c2559ad91..56cc712b7 100644
--- a/src/routes/Detail/VideosList/VideosList.js
+++ b/src/routes/Detail/VideosList/VideosList.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import Icon from 'stremio-icons/dom';
-import { Popup } from 'stremio-common';
+import { Popup } from 'stremio/common';
 import Video from './Video';
 import styles from './styles';
 
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 82100ae31..2ca29ba16 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -1,5 +1,5 @@
 const React = require('react');
-const { MainNavBar } = require('stremio-common');
+const { MainNavBar } = require('stremio/common');
 const styles = require('./styles');
 
 class Library extends React.Component {
diff --git a/src/routes/Player/BufferingLoader/BufferingLoader.js b/src/routes/Player/BufferingLoader/BufferingLoader.js
index 19ecc3152..22a6e1389 100644
--- a/src/routes/Player/BufferingLoader/BufferingLoader.js
+++ b/src/routes/Player/BufferingLoader/BufferingLoader.js
@@ -1,7 +1,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
-const { Loader } = require('stremio-common');
+const { Loader } = require('stremio/common');
 const colors = require('stremio-colors');
 const styles = require('./styles');
 
diff --git a/src/routes/Player/ControlBar/SeekBar/SeekBar.js b/src/routes/Player/ControlBar/SeekBar/SeekBar.js
index 4fdbacb37..b2e34d63d 100644
--- a/src/routes/Player/ControlBar/SeekBar/SeekBar.js
+++ b/src/routes/Player/ControlBar/SeekBar/SeekBar.js
@@ -2,7 +2,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const debounce = require('lodash.debounce');
-const { Slider } = require('stremio-common');
+const { Slider } = require('stremio/common');
 const styles = require('./styles');
 
 class SeekBar extends React.Component {
diff --git a/src/routes/Player/ControlBar/ShareButton/ShareButton.js b/src/routes/Player/ControlBar/ShareButton/ShareButton.js
index 6c8fae1e8..8b9c00352 100644
--- a/src/routes/Player/ControlBar/ShareButton/ShareButton.js
+++ b/src/routes/Player/ControlBar/ShareButton/ShareButton.js
@@ -2,7 +2,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
-const { Popup } = require('stremio-common');
+const { Popup } = require('stremio/common');
 const styles = require('./styles');
 
 class ShareButton extends React.Component {
diff --git a/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesButton.js b/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesButton.js
index b6ffe04e9..a737f9c83 100644
--- a/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesButton.js
+++ b/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesButton.js
@@ -2,7 +2,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
-const { Popup } = require('stremio-common');
+const { Popup } = require('stremio/common');
 const SubtitlesPicker = require('./SubtitlesPicker');
 const styles = require('./styles');
 
diff --git a/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesPicker/SubtitlesPicker.js b/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesPicker/SubtitlesPicker.js
index 2f46d8a60..5dc703229 100644
--- a/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesPicker/SubtitlesPicker.js
+++ b/src/routes/Player/ControlBar/SubtitlesButton/SubtitlesPicker/SubtitlesPicker.js
@@ -3,7 +3,7 @@ const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const { Modal } = require('stremio-navigation');
-const { ColorPicker } = require('stremio-common');
+const { ColorPicker } = require('stremio/common');
 const styles = require('./styles');
 
 const ORIGIN_PRIORITIES = Object.freeze({
diff --git a/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js b/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js
index 00665a38c..96710f55c 100644
--- a/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js
+++ b/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js
@@ -2,7 +2,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const debounce = require('lodash.debounce');
-const { Slider } = require('stremio-common');
+const { Slider } = require('stremio/common');
 const styles = require('./styles');
 
 class VolumeSlider extends React.Component {
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index 4480b28a0..60893ee32 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -1,5 +1,5 @@
 const React = require('react');
-const { MainNavBar } = require('stremio-common');
+const { MainNavBar } = require('stremio/common');
 const styles = require('./styles');
 
 class Search extends React.Component {
diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index a63c452fe..abcfcf59e 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Icon from 'stremio-icons/dom';
-import { Input, Popup, Checkbox } from 'stremio-common';
+import { Input, Popup, Checkbox } from 'stremio/common';
 import classnames from 'classnames';
 import styles from './styles';
 
diff --git a/webpack.config.js b/webpack.config.js
index 728640537..333475e98 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -113,9 +113,6 @@ module.exports = {
         extensions: ['.js', '.json', '.less', '.wasm'],
         alias: {
             'stremio': path.resolve(__dirname, 'src'),
-            'stremio-common': path.resolve(__dirname, 'src/common'),
-            'stremio-routes': path.resolve(__dirname, 'src/routes'),
-            'stremio-services': path.resolve(__dirname, 'src/services'),
             'stremio-navigation': path.resolve(__dirname, 'src/navigation')
         }
     },