diff --git a/.env b/.env
index 4622f8c..120ed6b 100644
--- a/.env
+++ b/.env
@@ -6,4 +6,6 @@ DB=mongo
 
 # Expiry time after which an entry in the databse will be deleted automatically. 
 # Default set to 1 day.
-expireTime='1d'
\ No newline at end of file
+expireTime='1d'
+
+SKIP_PREFLIGHT_CHECK=true 
\ No newline at end of file
diff --git a/db/mongo.sh b/db/mongo.sh
old mode 100644
new mode 100755
diff --git a/views/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from views/public/favicon.ico
rename to public/favicon.ico
diff --git a/views/public/index.html b/public/index.html
similarity index 100%
rename from views/public/index.html
rename to public/index.html
diff --git a/views/public/logo192.png b/public/logo192.png
similarity index 100%
rename from views/public/logo192.png
rename to public/logo192.png
diff --git a/views/public/logo512.png b/public/logo512.png
similarity index 100%
rename from views/public/logo512.png
rename to public/logo512.png
diff --git a/views/public/manifest.json b/public/manifest.json
similarity index 100%
rename from views/public/manifest.json
rename to public/manifest.json
diff --git a/views/public/robots.txt b/public/robots.txt
similarity index 100%
rename from views/public/robots.txt
rename to public/robots.txt
diff --git a/setup.sh b/setup.sh
index b230b2e..4db4d75 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,4 +11,5 @@ sudo chown -R mongodb:mongodb /var/lib/mongodb
 sudo chown mongodb:mongodb /tmp/mongodb-27017.sock
 ./db/mongo.sh start 
 systemctl enable mongod
-cd views && npm run build
\ No newline at end of file
+npm run build
+#cd views && npm run build
\ No newline at end of file
diff --git a/views/src/App.css b/src/App.css
similarity index 100%
rename from views/src/App.css
rename to src/App.css
diff --git a/views/src/App.js b/src/App.js
similarity index 100%
rename from views/src/App.js
rename to src/App.js
diff --git a/views/src/App.test.js b/src/App.test.js
similarity index 100%
rename from views/src/App.test.js
rename to src/App.test.js
diff --git a/views/src/CSS/Main.css b/src/CSS/Main.css
similarity index 100%
rename from views/src/CSS/Main.css
rename to src/CSS/Main.css
diff --git a/views/src/Components/Common/CollapsibleButton.js b/src/Components/Common/CollapsibleButton.js
similarity index 100%
rename from views/src/Components/Common/CollapsibleButton.js
rename to src/Components/Common/CollapsibleButton.js
diff --git a/views/src/Components/Common/Header.js b/src/Components/Common/Header.js
similarity index 100%
rename from views/src/Components/Common/Header.js
rename to src/Components/Common/Header.js
diff --git a/views/src/Components/Common/OthersView.js b/src/Components/Common/OthersView.js
similarity index 100%
rename from views/src/Components/Common/OthersView.js
rename to src/Components/Common/OthersView.js
diff --git a/views/src/Components/Common/Overlays.js b/src/Components/Common/Overlays.js
similarity index 100%
rename from views/src/Components/Common/Overlays.js
rename to src/Components/Common/Overlays.js
diff --git a/views/src/Components/Common/OverlaysView.js b/src/Components/Common/OverlaysView.js
similarity index 95%
rename from views/src/Components/Common/OverlaysView.js
rename to src/Components/Common/OverlaysView.js
index 932d963..2557906 100644
--- a/views/src/Components/Common/OverlaysView.js
+++ b/src/Components/Common/OverlaysView.js
@@ -133,8 +133,8 @@ class OverlaysView extends React.Component {
 
     var allowOrigin = 'https://cors-anywhere.herokuapp.com/'
     // var allowOrigin = ''
-    var nodeURL = allowOrigin + 'http://' + Config.ip + ':' + Config.port + '/IPOP/overlays/' + overlayId + '/nodes?interval=' + intervalNo + '&current_state=True'
-    var linkURL = allowOrigin + 'http://' + Config.ip + ':' + Config.port + '/IPOP/overlays/' + overlayId + '/links?interval=' + intervalNo + '&current_state=True'
+    var nodeURL = allowOrigin + 'http://localhost' + ':' + this.port + '/IPOP/overlays/' + overlayId + '/nodes?interval=' + intervalNo + '&current_state=True'
+    var linkURL = allowOrigin + 'http://localhost' + ':' + this.port + '/IPOP/overlays/' + overlayId + '/links?interval=' + intervalNo + '&current_state=True'
 
     //console.log(nodeURL);
 
diff --git a/views/src/Components/Common/RightPanel.js b/src/Components/Common/RightPanel.js
similarity index 100%
rename from views/src/Components/Common/RightPanel.js
rename to src/Components/Common/RightPanel.js
diff --git a/views/src/Components/Common/Topology.js b/src/Components/Common/Topology.js
similarity index 100%
rename from views/src/Components/Common/Topology.js
rename to src/Components/Common/Topology.js
diff --git a/views/src/Components/Common/ViewSelector.js b/src/Components/Common/ViewSelector.js
similarity index 100%
rename from views/src/Components/Common/ViewSelector.js
rename to src/Components/Common/ViewSelector.js
diff --git a/views/src/Components/Common/cytoscapeStyle.js b/src/Components/Common/cytoscapeStyle.js
similarity index 100%
rename from views/src/Components/Common/cytoscapeStyle.js
rename to src/Components/Common/cytoscapeStyle.js
diff --git a/views/src/Images/Icons/blue_node__ic.svg b/src/Images/Icons/blue_node__ic.svg
similarity index 100%
rename from views/src/Images/Icons/blue_node__ic.svg
rename to src/Images/Icons/blue_node__ic.svg
diff --git a/views/src/Images/Icons/blue_node_selected__ic.svg b/src/Images/Icons/blue_node_selected__ic.svg
similarity index 100%
rename from views/src/Images/Icons/blue_node_selected__ic.svg
rename to src/Images/Icons/blue_node_selected__ic.svg
diff --git a/views/src/Images/Icons/config_ic.svg b/src/Images/Icons/config_ic.svg
similarity index 100%
rename from views/src/Images/Icons/config_ic.svg
rename to src/Images/Icons/config_ic.svg
diff --git a/views/src/Images/Icons/connected_ic.svg b/src/Images/Icons/connected_ic.svg
similarity index 100%
rename from views/src/Images/Icons/connected_ic.svg
rename to src/Images/Icons/connected_ic.svg
diff --git a/views/src/Images/Icons/down-arrow-ic.svg b/src/Images/Icons/down-arrow-ic.svg
similarity index 100%
rename from views/src/Images/Icons/down-arrow-ic.svg
rename to src/Images/Icons/down-arrow-ic.svg
diff --git a/views/src/Images/Icons/elementBreadcrumb.svg b/src/Images/Icons/elementBreadcrumb.svg
similarity index 100%
rename from views/src/Images/Icons/elementBreadcrumb.svg
rename to src/Images/Icons/elementBreadcrumb.svg
diff --git a/views/src/Images/Icons/green_node_ic.svg b/src/Images/Icons/green_node_ic.svg
similarity index 100%
rename from views/src/Images/Icons/green_node_ic.svg
rename to src/Images/Icons/green_node_ic.svg
diff --git a/views/src/Images/Icons/green_node_selected_ic.svg b/src/Images/Icons/green_node_selected_ic.svg
similarity index 100%
rename from views/src/Images/Icons/green_node_selected_ic.svg
rename to src/Images/Icons/green_node_selected_ic.svg
diff --git a/views/src/Images/Icons/home_ic.svg b/src/Images/Icons/home_ic.svg
similarity index 100%
rename from views/src/Images/Icons/home_ic.svg
rename to src/Images/Icons/home_ic.svg
diff --git a/views/src/Images/Icons/info_ic.svg b/src/Images/Icons/info_ic.svg
similarity index 100%
rename from views/src/Images/Icons/info_ic.svg
rename to src/Images/Icons/info_ic.svg
diff --git a/views/src/Images/Icons/ipop_ic.svg b/src/Images/Icons/ipop_ic.svg
similarity index 100%
rename from views/src/Images/Icons/ipop_ic.svg
rename to src/Images/Icons/ipop_ic.svg
diff --git a/views/src/Images/Icons/longdistance_ic.svg b/src/Images/Icons/longdistance_ic.svg
similarity index 100%
rename from views/src/Images/Icons/longdistance_ic.svg
rename to src/Images/Icons/longdistance_ic.svg
diff --git a/views/src/Images/Icons/menu_ic.svg b/src/Images/Icons/menu_ic.svg
similarity index 100%
rename from views/src/Images/Icons/menu_ic.svg
rename to src/Images/Icons/menu_ic.svg
diff --git a/views/src/Images/Icons/minus_ic.svg b/src/Images/Icons/minus_ic.svg
similarity index 100%
rename from views/src/Images/Icons/minus_ic.svg
rename to src/Images/Icons/minus_ic.svg
diff --git a/views/src/Images/Icons/no_tunnel_ic.svg b/src/Images/Icons/no_tunnel_ic.svg
similarity index 100%
rename from views/src/Images/Icons/no_tunnel_ic.svg
rename to src/Images/Icons/no_tunnel_ic.svg
diff --git a/views/src/Images/Icons/node_ic.svg b/src/Images/Icons/node_ic.svg
similarity index 100%
rename from views/src/Images/Icons/node_ic.svg
rename to src/Images/Icons/node_ic.svg
diff --git a/views/src/Images/Icons/not_reporting_ic.svg b/src/Images/Icons/not_reporting_ic.svg
similarity index 100%
rename from views/src/Images/Icons/not_reporting_ic.svg
rename to src/Images/Icons/not_reporting_ic.svg
diff --git a/views/src/Images/Icons/ondemand_ic.svg b/src/Images/Icons/ondemand_ic.svg
similarity index 100%
rename from views/src/Images/Icons/ondemand_ic.svg
rename to src/Images/Icons/ondemand_ic.svg
diff --git a/views/src/Images/Icons/overlayBreadcrumb.svg b/src/Images/Icons/overlayBreadcrumb.svg
similarity index 100%
rename from views/src/Images/Icons/overlayBreadcrumb.svg
rename to src/Images/Icons/overlayBreadcrumb.svg
diff --git a/views/src/Images/Icons/overlay_ic.svg b/src/Images/Icons/overlay_ic.svg
similarity index 100%
rename from views/src/Images/Icons/overlay_ic.svg
rename to src/Images/Icons/overlay_ic.svg
diff --git a/views/src/Images/Icons/plus_ic.svg b/src/Images/Icons/plus_ic.svg
similarity index 100%
rename from views/src/Images/Icons/plus_ic.svg
rename to src/Images/Icons/plus_ic.svg
diff --git a/views/src/Images/Icons/refresh_ic.svg b/src/Images/Icons/refresh_ic.svg
similarity index 100%
rename from views/src/Images/Icons/refresh_ic.svg
rename to src/Images/Icons/refresh_ic.svg
diff --git a/views/src/Images/Icons/static_ic.svg b/src/Images/Icons/static_ic.svg
similarity index 100%
rename from views/src/Images/Icons/static_ic.svg
rename to src/Images/Icons/static_ic.svg
diff --git a/views/src/Images/Icons/successor_ic.svg b/src/Images/Icons/successor_ic.svg
similarity index 100%
rename from views/src/Images/Icons/successor_ic.svg
rename to src/Images/Icons/successor_ic.svg
diff --git a/views/src/Images/Icons/swap_ic.svg b/src/Images/Icons/swap_ic.svg
similarity index 100%
rename from views/src/Images/Icons/swap_ic.svg
rename to src/Images/Icons/swap_ic.svg
diff --git a/views/src/Images/Icons/tunnel_ic.svg b/src/Images/Icons/tunnel_ic.svg
similarity index 100%
rename from views/src/Images/Icons/tunnel_ic.svg
rename to src/Images/Icons/tunnel_ic.svg
diff --git a/views/src/Images/Icons/up-arrow-ic.svg b/src/Images/Icons/up-arrow-ic.svg
similarity index 100%
rename from views/src/Images/Icons/up-arrow-ic.svg
rename to src/Images/Icons/up-arrow-ic.svg
diff --git a/views/src/Images/Icons/yellow_node_ic.svg b/src/Images/Icons/yellow_node_ic.svg
similarity index 100%
rename from views/src/Images/Icons/yellow_node_ic.svg
rename to src/Images/Icons/yellow_node_ic.svg
diff --git a/views/src/Images/Icons/yellow_node_selected_ic.svg b/src/Images/Icons/yellow_node_selected_ic.svg
similarity index 100%
rename from views/src/Images/Icons/yellow_node_selected_ic.svg
rename to src/Images/Icons/yellow_node_selected_ic.svg
diff --git a/views/src/config.js b/src/config.js
similarity index 100%
rename from views/src/config.js
rename to src/config.js
diff --git a/views/src/cytoscape-popper.js b/src/cytoscape-popper.js
similarity index 100%
rename from views/src/cytoscape-popper.js
rename to src/cytoscape-popper.js
diff --git a/views/src/cytoscape.min.js b/src/cytoscape.min.js
similarity index 100%
rename from views/src/cytoscape.min.js
rename to src/cytoscape.min.js
diff --git a/views/src/index.css b/src/index.css
similarity index 100%
rename from views/src/index.css
rename to src/index.css
diff --git a/views/src/index.js b/src/index.js
similarity index 100%
rename from views/src/index.js
rename to src/index.js
diff --git a/views/src/logo.svg b/src/logo.svg
similarity index 100%
rename from views/src/logo.svg
rename to src/logo.svg
diff --git a/views/src/serviceWorker.js b/src/serviceWorker.js
similarity index 100%
rename from views/src/serviceWorker.js
rename to src/serviceWorker.js