diff --git a/web/app/app.js b/web/app/app.js
index ea99d3c0..8a78288c 100644
--- a/web/app/app.js
+++ b/web/app/app.js
@@ -2,7 +2,7 @@ import { h, render } from 'preact';
 import 'babel-polyfill'; // TODO: remove it
 import 'mimic'; // TODO: it's for dev only
 
-import './polyfills'; // TODO: check it
+import 'common/polyfills'; // TODO: check it
 
 import Root from './components/root';
 
diff --git a/web/app/fetcher.js b/web/app/common/fetcher.js
similarity index 98%
rename from web/app/fetcher.js
rename to web/app/common/fetcher.js
index a5a28cf8..18c1bd6c 100644
--- a/web/app/fetcher.js
+++ b/web/app/common/fetcher.js
@@ -1,4 +1,4 @@
-import './promises';
+import 'common/promises';
 
 // TODO: i think we need to use unfetch here instead of heavy axios
 import axios from 'axios';
diff --git a/web/app/polyfills.js b/web/app/common/polyfills.js
similarity index 100%
rename from web/app/polyfills.js
rename to web/app/common/polyfills.js
diff --git a/web/app/promises.js b/web/app/common/promises.js
similarity index 100%
rename from web/app/promises.js
rename to web/app/common/promises.js
diff --git a/web/app/settings.js b/web/app/common/settings.js
similarity index 100%
rename from web/app/settings.js
rename to web/app/common/settings.js
diff --git a/web/app/components/root/root.jsx b/web/app/components/root/root.jsx
index 70443552..b1189aaf 100644
--- a/web/app/components/root/root.jsx
+++ b/web/app/components/root/root.jsx
@@ -1,5 +1,5 @@
 import { Component } from 'preact';
-import fetcher from 'fetcher';
+import fetcher from 'common/fetcher';
 
 export default class Root extends Component {
   componentDidMount() {
diff --git a/web/app/render.js b/web/app/render.js
index 4799a954..01021a30 100644
--- a/web/app/render.js
+++ b/web/app/render.js
@@ -1,8 +1,6 @@
-import tmpl from 'blueimp-tmpl';
+import { nodeId } from './common/settings';
 
-import { nodeId } from './settings';
-
-import fetcher from './fetcher';
+import fetcher from './common/fetcher';
 
 let node = null;
 let afterInit = null;