diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/font-awesome.css b/cytoscape/css/font-awesome.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/font-awesome.css
rename to cytoscape/css/font-awesome.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/index.css b/cytoscape/css/index.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/index.css
rename to cytoscape/css/index.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/normalize.css b/cytoscape/css/normalize.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/normalize.css
rename to cytoscape/css/normalize.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/open-sans.css b/cytoscape/css/open-sans.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/open-sans.css
rename to cytoscape/css/open-sans.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/skeleton.css b/cytoscape/css/skeleton.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/skeleton.css
rename to cytoscape/css/skeleton.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/css/tooltipster.bundle.min.css b/cytoscape/css/tooltipster.bundle.min.css
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/css/tooltipster.bundle.min.css
rename to cytoscape/css/tooltipster.bundle.min.css
diff --git a/cytoscape/cytoscape.js-tutorial-demo/datasets/custom.json b/cytoscape/datasets/custom.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/datasets/custom.json
rename to cytoscape/datasets/custom.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/datasets/genes.json b/cytoscape/datasets/genes.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/datasets/genes.json
rename to cytoscape/datasets/genes.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/datasets/getentitiy.json b/cytoscape/datasets/getentitiy.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/datasets/getentitiy.json
rename to cytoscape/datasets/getentitiy.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/datasets/getmentions.json b/cytoscape/datasets/getmentions.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/datasets/getmentions.json
rename to cytoscape/datasets/getmentions.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/datasets/social.json b/cytoscape/datasets/social.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/datasets/social.json
rename to cytoscape/datasets/social.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/FontAwesome.otf b/cytoscape/fonts/FontAwesome.otf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/FontAwesome.otf
rename to cytoscape/fonts/FontAwesome.otf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.eot b/cytoscape/fonts/OpenSans-Bold-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.eot
rename to cytoscape/fonts/OpenSans-Bold-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.svg b/cytoscape/fonts/OpenSans-Bold-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.svg
rename to cytoscape/fonts/OpenSans-Bold-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.ttf b/cytoscape/fonts/OpenSans-Bold-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.ttf
rename to cytoscape/fonts/OpenSans-Bold-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.woff b/cytoscape/fonts/OpenSans-Bold-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Bold-webfont.woff
rename to cytoscape/fonts/OpenSans-Bold-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.eot b/cytoscape/fonts/OpenSans-BoldItalic-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.eot
rename to cytoscape/fonts/OpenSans-BoldItalic-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.svg b/cytoscape/fonts/OpenSans-BoldItalic-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.svg
rename to cytoscape/fonts/OpenSans-BoldItalic-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.ttf b/cytoscape/fonts/OpenSans-BoldItalic-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.ttf
rename to cytoscape/fonts/OpenSans-BoldItalic-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.woff b/cytoscape/fonts/OpenSans-BoldItalic-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-BoldItalic-webfont.woff
rename to cytoscape/fonts/OpenSans-BoldItalic-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.eot b/cytoscape/fonts/OpenSans-ExtraBold-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.eot
rename to cytoscape/fonts/OpenSans-ExtraBold-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.svg b/cytoscape/fonts/OpenSans-ExtraBold-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.svg
rename to cytoscape/fonts/OpenSans-ExtraBold-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.ttf b/cytoscape/fonts/OpenSans-ExtraBold-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.ttf
rename to cytoscape/fonts/OpenSans-ExtraBold-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.woff b/cytoscape/fonts/OpenSans-ExtraBold-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBold-webfont.woff
rename to cytoscape/fonts/OpenSans-ExtraBold-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.eot b/cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.eot
rename to cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.svg b/cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.svg
rename to cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.ttf b/cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
rename to cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.woff b/cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-ExtraBoldItalic-webfont.woff
rename to cytoscape/fonts/OpenSans-ExtraBoldItalic-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.eot b/cytoscape/fonts/OpenSans-Italic-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.eot
rename to cytoscape/fonts/OpenSans-Italic-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.svg b/cytoscape/fonts/OpenSans-Italic-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.svg
rename to cytoscape/fonts/OpenSans-Italic-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.ttf b/cytoscape/fonts/OpenSans-Italic-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.ttf
rename to cytoscape/fonts/OpenSans-Italic-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.woff b/cytoscape/fonts/OpenSans-Italic-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Italic-webfont.woff
rename to cytoscape/fonts/OpenSans-Italic-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.eot b/cytoscape/fonts/OpenSans-Light-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.eot
rename to cytoscape/fonts/OpenSans-Light-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.svg b/cytoscape/fonts/OpenSans-Light-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.svg
rename to cytoscape/fonts/OpenSans-Light-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.ttf b/cytoscape/fonts/OpenSans-Light-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.ttf
rename to cytoscape/fonts/OpenSans-Light-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.woff b/cytoscape/fonts/OpenSans-Light-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Light-webfont.woff
rename to cytoscape/fonts/OpenSans-Light-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.eot b/cytoscape/fonts/OpenSans-LightItalic-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.eot
rename to cytoscape/fonts/OpenSans-LightItalic-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.svg b/cytoscape/fonts/OpenSans-LightItalic-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.svg
rename to cytoscape/fonts/OpenSans-LightItalic-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.ttf b/cytoscape/fonts/OpenSans-LightItalic-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.ttf
rename to cytoscape/fonts/OpenSans-LightItalic-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.woff b/cytoscape/fonts/OpenSans-LightItalic-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-LightItalic-webfont.woff
rename to cytoscape/fonts/OpenSans-LightItalic-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.eot b/cytoscape/fonts/OpenSans-Regular-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.eot
rename to cytoscape/fonts/OpenSans-Regular-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.svg b/cytoscape/fonts/OpenSans-Regular-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.svg
rename to cytoscape/fonts/OpenSans-Regular-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.ttf b/cytoscape/fonts/OpenSans-Regular-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.ttf
rename to cytoscape/fonts/OpenSans-Regular-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.woff b/cytoscape/fonts/OpenSans-Regular-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Regular-webfont.woff
rename to cytoscape/fonts/OpenSans-Regular-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.eot b/cytoscape/fonts/OpenSans-Semibold-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.eot
rename to cytoscape/fonts/OpenSans-Semibold-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.svg b/cytoscape/fonts/OpenSans-Semibold-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.svg
rename to cytoscape/fonts/OpenSans-Semibold-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.ttf b/cytoscape/fonts/OpenSans-Semibold-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.ttf
rename to cytoscape/fonts/OpenSans-Semibold-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.woff b/cytoscape/fonts/OpenSans-Semibold-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-Semibold-webfont.woff
rename to cytoscape/fonts/OpenSans-Semibold-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.eot b/cytoscape/fonts/OpenSans-SemiboldItalic-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.eot
rename to cytoscape/fonts/OpenSans-SemiboldItalic-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.svg b/cytoscape/fonts/OpenSans-SemiboldItalic-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.svg
rename to cytoscape/fonts/OpenSans-SemiboldItalic-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.ttf b/cytoscape/fonts/OpenSans-SemiboldItalic-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.ttf
rename to cytoscape/fonts/OpenSans-SemiboldItalic-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.woff b/cytoscape/fonts/OpenSans-SemiboldItalic-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/OpenSans-SemiboldItalic-webfont.woff
rename to cytoscape/fonts/OpenSans-SemiboldItalic-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.eot b/cytoscape/fonts/fontawesome-webfont.eot
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.eot
rename to cytoscape/fonts/fontawesome-webfont.eot
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.svg b/cytoscape/fonts/fontawesome-webfont.svg
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.svg
rename to cytoscape/fonts/fontawesome-webfont.svg
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.ttf b/cytoscape/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.ttf
rename to cytoscape/fonts/fontawesome-webfont.ttf
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.woff b/cytoscape/fonts/fontawesome-webfont.woff
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.woff
rename to cytoscape/fonts/fontawesome-webfont.woff
diff --git a/cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.woff2 b/cytoscape/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/fonts/fontawesome-webfont.woff2
rename to cytoscape/fonts/fontawesome-webfont.woff2
diff --git a/cytoscape/cytoscape.js-tutorial-demo/index.html b/cytoscape/index.html
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/index.html
rename to cytoscape/index.html
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/cola.js b/cytoscape/js/cola.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/cola.js
rename to cytoscape/js/cola.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/cytoscape-cola.js b/cytoscape/js/cytoscape-cola.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/cytoscape-cola.js
rename to cytoscape/js/cytoscape-cola.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/cytoscape.min.js b/cytoscape/js/cytoscape.min.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/cytoscape.min.js
rename to cytoscape/js/cytoscape.min.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/index.js b/cytoscape/js/index.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/index.js
rename to cytoscape/js/index.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/jquery-3.1.1.min.js b/cytoscape/js/jquery-3.1.1.min.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/jquery-3.1.1.min.js
rename to cytoscape/js/jquery-3.1.1.min.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/js/tooltipster.bundle.min.js b/cytoscape/js/tooltipster.bundle.min.js
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/js/tooltipster.bundle.min.js
rename to cytoscape/js/tooltipster.bundle.min.js
diff --git a/cytoscape/cytoscape.js-tutorial-demo/stylesheets/custom.cycss b/cytoscape/stylesheets/custom.cycss
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/stylesheets/custom.cycss
rename to cytoscape/stylesheets/custom.cycss
diff --git a/cytoscape/cytoscape.js-tutorial-demo/stylesheets/fancy.json b/cytoscape/stylesheets/fancy.json
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/stylesheets/fancy.json
rename to cytoscape/stylesheets/fancy.json
diff --git a/cytoscape/cytoscape.js-tutorial-demo/stylesheets/plain.cycss b/cytoscape/stylesheets/plain.cycss
similarity index 100%
rename from cytoscape/cytoscape.js-tutorial-demo/stylesheets/plain.cycss
rename to cytoscape/stylesheets/plain.cycss