diff --git a/src/cn.html b/src/html/cn.html
similarity index 100%
rename from src/cn.html
rename to src/html/cn.html
diff --git a/src/dapps/wallet/css/assets/icon_add_green.svg b/src/html/dapps/wallet/css/assets/icon_add_green.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_add_green.svg
rename to src/html/dapps/wallet/css/assets/icon_add_green.svg
diff --git a/src/dapps/wallet/css/assets/icon_back_copy.svg b/src/html/dapps/wallet/css/assets/icon_back_copy.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_back_copy.svg
rename to src/html/dapps/wallet/css/assets/icon_back_copy.svg
diff --git a/src/dapps/wallet/css/assets/icon_close_gray.svg b/src/html/dapps/wallet/css/assets/icon_close_gray.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_close_gray.svg
rename to src/html/dapps/wallet/css/assets/icon_close_gray.svg
diff --git a/src/dapps/wallet/css/assets/icon_copy_gray.svg b/src/html/dapps/wallet/css/assets/icon_copy_gray.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_copy_gray.svg
rename to src/html/dapps/wallet/css/assets/icon_copy_gray.svg
diff --git a/src/dapps/wallet/css/assets/icon_plus_gray.svg b/src/html/dapps/wallet/css/assets/icon_plus_gray.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_plus_gray.svg
rename to src/html/dapps/wallet/css/assets/icon_plus_gray.svg
diff --git a/src/dapps/wallet/css/assets/icon_qr.svg b/src/html/dapps/wallet/css/assets/icon_qr.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_qr.svg
rename to src/html/dapps/wallet/css/assets/icon_qr.svg
diff --git a/src/dapps/wallet/css/assets/icon_remove_red.svg b/src/html/dapps/wallet/css/assets/icon_remove_red.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_remove_red.svg
rename to src/html/dapps/wallet/css/assets/icon_remove_red.svg
diff --git a/src/dapps/wallet/css/assets/icon_remove_red_copy_2.svg b/src/html/dapps/wallet/css/assets/icon_remove_red_copy_2.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_remove_red_copy_2.svg
rename to src/html/dapps/wallet/css/assets/icon_remove_red_copy_2.svg
diff --git a/src/dapps/wallet/css/assets/icon_send_white.svg b/src/html/dapps/wallet/css/assets/icon_send_white.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_send_white.svg
rename to src/html/dapps/wallet/css/assets/icon_send_white.svg
diff --git a/src/dapps/wallet/css/assets/icon_update.svg b/src/html/dapps/wallet/css/assets/icon_update.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_update.svg
rename to src/html/dapps/wallet/css/assets/icon_update.svg
diff --git a/src/dapps/wallet/css/assets/icon_wallet_gray.svg b/src/html/dapps/wallet/css/assets/icon_wallet_gray.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_wallet_gray.svg
rename to src/html/dapps/wallet/css/assets/icon_wallet_gray.svg
diff --git a/src/dapps/wallet/css/assets/icon_wallet_gray_copy.svg b/src/html/dapps/wallet/css/assets/icon_wallet_gray_copy.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/icon_wallet_gray_copy.svg
rename to src/html/dapps/wallet/css/assets/icon_wallet_gray_copy.svg
diff --git a/src/dapps/wallet/css/assets/scan_blue.svg b/src/html/dapps/wallet/css/assets/scan_blue.svg
similarity index 100%
rename from src/dapps/wallet/css/assets/scan_blue.svg
rename to src/html/dapps/wallet/css/assets/scan_blue.svg
diff --git a/src/dapps/wallet/css/fonts/slick.eot b/src/html/dapps/wallet/css/fonts/slick.eot
similarity index 100%
rename from src/dapps/wallet/css/fonts/slick.eot
rename to src/html/dapps/wallet/css/fonts/slick.eot
diff --git a/src/dapps/wallet/css/fonts/slick.svg b/src/html/dapps/wallet/css/fonts/slick.svg
similarity index 100%
rename from src/dapps/wallet/css/fonts/slick.svg
rename to src/html/dapps/wallet/css/fonts/slick.svg
diff --git a/src/dapps/wallet/css/fonts/slick.ttf b/src/html/dapps/wallet/css/fonts/slick.ttf
similarity index 100%
rename from src/dapps/wallet/css/fonts/slick.ttf
rename to src/html/dapps/wallet/css/fonts/slick.ttf
diff --git a/src/dapps/wallet/css/fonts/slick.woff b/src/html/dapps/wallet/css/fonts/slick.woff
similarity index 100%
rename from src/dapps/wallet/css/fonts/slick.woff
rename to src/html/dapps/wallet/css/fonts/slick.woff
diff --git a/src/dapps/wallet/css/slick.css b/src/html/dapps/wallet/css/slick.css
similarity index 100%
rename from src/dapps/wallet/css/slick.css
rename to src/html/dapps/wallet/css/slick.css
diff --git a/src/dapps/wallet/css/style.css b/src/html/dapps/wallet/css/style.css
similarity index 100%
rename from src/dapps/wallet/css/style.css
rename to src/html/dapps/wallet/css/style.css
diff --git a/src/dapps/wallet/index.html b/src/html/dapps/wallet/index.html
similarity index 100%
rename from src/dapps/wallet/index.html
rename to src/html/dapps/wallet/index.html
diff --git a/src/dapps/wallet/js/compiled/app.js b/src/html/dapps/wallet/js/compiled/app.js
similarity index 100%
rename from src/dapps/wallet/js/compiled/app.js
rename to src/html/dapps/wallet/js/compiled/app.js
diff --git a/src/demo/account_list.html b/src/html/demo/account_list.html
similarity index 100%
rename from src/demo/account_list.html
rename to src/html/demo/account_list.html
diff --git a/src/demo/assets/icon_add_green.svg b/src/html/demo/assets/icon_add_green.svg
similarity index 100%
rename from src/demo/assets/icon_add_green.svg
rename to src/html/demo/assets/icon_add_green.svg
diff --git a/src/demo/assets/icon_back_copy.svg b/src/html/demo/assets/icon_back_copy.svg
similarity index 100%
rename from src/demo/assets/icon_back_copy.svg
rename to src/html/demo/assets/icon_back_copy.svg
diff --git a/src/demo/assets/icon_close_gray.svg b/src/html/demo/assets/icon_close_gray.svg
similarity index 100%
rename from src/demo/assets/icon_close_gray.svg
rename to src/html/demo/assets/icon_close_gray.svg
diff --git a/src/demo/assets/icon_copy_gray.svg b/src/html/demo/assets/icon_copy_gray.svg
similarity index 100%
rename from src/demo/assets/icon_copy_gray.svg
rename to src/html/demo/assets/icon_copy_gray.svg
diff --git a/src/demo/assets/icon_plus_gray.svg b/src/html/demo/assets/icon_plus_gray.svg
similarity index 100%
rename from src/demo/assets/icon_plus_gray.svg
rename to src/html/demo/assets/icon_plus_gray.svg
diff --git a/src/demo/assets/icon_qr.svg b/src/html/demo/assets/icon_qr.svg
similarity index 100%
rename from src/demo/assets/icon_qr.svg
rename to src/html/demo/assets/icon_qr.svg
diff --git a/src/demo/assets/icon_remove_red.svg b/src/html/demo/assets/icon_remove_red.svg
similarity index 100%
rename from src/demo/assets/icon_remove_red.svg
rename to src/html/demo/assets/icon_remove_red.svg
diff --git a/src/demo/assets/icon_remove_red_copy_2.svg b/src/html/demo/assets/icon_remove_red_copy_2.svg
similarity index 100%
rename from src/demo/assets/icon_remove_red_copy_2.svg
rename to src/html/demo/assets/icon_remove_red_copy_2.svg
diff --git a/src/demo/assets/icon_send_white.svg b/src/html/demo/assets/icon_send_white.svg
similarity index 100%
rename from src/demo/assets/icon_send_white.svg
rename to src/html/demo/assets/icon_send_white.svg
diff --git a/src/demo/assets/icon_update.svg b/src/html/demo/assets/icon_update.svg
similarity index 100%
rename from src/demo/assets/icon_update.svg
rename to src/html/demo/assets/icon_update.svg
diff --git a/src/demo/assets/icon_wallet_gray.svg b/src/html/demo/assets/icon_wallet_gray.svg
similarity index 100%
rename from src/demo/assets/icon_wallet_gray.svg
rename to src/html/demo/assets/icon_wallet_gray.svg
diff --git a/src/demo/assets/icon_wallet_gray_copy.svg b/src/html/demo/assets/icon_wallet_gray_copy.svg
similarity index 100%
rename from src/demo/assets/icon_wallet_gray_copy.svg
rename to src/html/demo/assets/icon_wallet_gray_copy.svg
diff --git a/src/demo/assets/scan_blue.svg b/src/html/demo/assets/scan_blue.svg
similarity index 100%
rename from src/demo/assets/scan_blue.svg
rename to src/html/demo/assets/scan_blue.svg
diff --git a/src/demo/send_money.html b/src/html/demo/send_money.html
similarity index 100%
rename from src/demo/send_money.html
rename to src/html/demo/send_money.html
diff --git a/src/demo/style.css b/src/html/demo/style.css
similarity index 100%
rename from src/demo/style.css
rename to src/html/demo/style.css
diff --git a/src/demo/wallet.html b/src/html/demo/wallet.html
similarity index 100%
rename from src/demo/wallet.html
rename to src/html/demo/wallet.html
diff --git a/src/demo/wallet_state.html b/src/html/demo/wallet_state.html
similarity index 100%
rename from src/demo/wallet_state.html
rename to src/html/demo/wallet_state.html
diff --git a/src/index.html b/src/html/index.html
old mode 100755
new mode 100644
similarity index 96%
rename from src/index.html
rename to src/html/index.html
index 51521b8..c67968b
--- a/src/index.html
+++ b/src/html/index.html
@@ -8,18 +8,18 @@
       <meta name="description" content="Status is an interface to access Ethereum, built for Android & iOS. Enjoy encrypted messaging, a cryptocurrency wallet, and seamless access to DApps.">
       <meta name="viewport" content="width=device-width, initial-scale=1">
 
-      <link rel="icon" type="image/png" href="dist/img/new-site/logo-32.png?v=0001" sizes="32x32" />
-      <link rel="icon" type="image/png" href="dist/img/new-site/logo-16.png?v=0001" sizes="16x16" />
+      <link rel="icon" type="image/png" href="img/new-site/logo-32.png?v=0001" sizes="32x32" />
+      <link rel="icon" type="image/png" href="img/new-site/logo-16.png?v=0001" sizes="16x16" />
 
-      <link rel="apple-touch-icon" href="dist/img/new-site/apple-touch-icon-1024.png?v=0001">
-      <link rel="apple-touch-icon" sizes="76x76" href="dist/img/new-site/apple-touch-icon-76.png?v=0001">
-      <link rel="apple-touch-icon" sizes="120x120" href="dist/img/new-site/apple-touch-icon-120.png?v=0001">
-      <link rel="apple-touch-icon" sizes="152x152" href="dist/img/new-site/apple-touch-icon-152.png?v=0001">
-      <link rel="apple-touch-icon" sizes="180x180" href="dist/img/new-site/apple-touch-icon-180.png?v=0001">
-      <link rel="mask-icon" href="dist/img/new-site/logo-mask.svg" color="4360DF">
+      <link rel="apple-touch-icon" href="img/new-site/apple-touch-icon-1024.png?v=0001">
+      <link rel="apple-touch-icon" sizes="76x76" href="img/new-site/apple-touch-icon-76.png?v=0001">
+      <link rel="apple-touch-icon" sizes="120x120" href="img/new-site/apple-touch-icon-120.png?v=0001">
+      <link rel="apple-touch-icon" sizes="152x152" href="img/new-site/apple-touch-icon-152.png?v=0001">
+      <link rel="apple-touch-icon" sizes="180x180" href="img/new-site/apple-touch-icon-180.png?v=0001">
+      <link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
 
       <!-- favicon.ico in the root directory -->
-      <link rel="stylesheet" href="dist/css/main.css?v=0001">
+      <link rel="stylesheet" href="css/main.css?v=0001">
       <meta property="og:title" content="Status, a Mobile Ethereum OS" />
 
     </head>
@@ -508,8 +508,8 @@
                     <a href="https://cn.status.im">中文</a>
 
 
-    <script src="dist/js/main.js?v=0001"></script>
-    <script src="dist/js/mc-validate.js?v=0001"></script>
+    <script src="js/main.js?v=0001"></script>
+    <script src="js/mc-validate.js?v=0001"></script>
     <!-- Google Analytics -->
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/src/jobs-api.html b/src/html/jobs-api.html
similarity index 100%
rename from src/jobs-api.html
rename to src/html/jobs-api.html
diff --git a/src/jobs.html b/src/html/jobs.html
similarity index 100%
rename from src/jobs.html
rename to src/html/jobs.html
diff --git a/src/join-riot.html b/src/html/join-riot.html
similarity index 100%
rename from src/join-riot.html
rename to src/html/join-riot.html
diff --git a/src/lgpl.html b/src/html/lgpl.html
similarity index 100%
rename from src/lgpl.html
rename to src/html/lgpl.html
diff --git a/src/open-positions.html b/src/html/open-positions.html
similarity index 100%
rename from src/open-positions.html
rename to src/html/open-positions.html
diff --git a/src/privacy-policy.html b/src/html/privacy-policy.html
similarity index 100%
rename from src/privacy-policy.html
rename to src/html/privacy-policy.html
diff --git a/src/success.html b/src/html/success.html
similarity index 100%
rename from src/success.html
rename to src/html/success.html