diff --git a/tox.ini b/tox.ini
index 5c9608d1..a840d36b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,10 @@ commands =
 
 [testenv:py38-notebooks]
 description = run tests on jupyter notebooks
+deps =
+	hnxwidget>=0.1.1b3
+	jupyter-contrib-nbextensions>=0.7.0
+	jupyter-nbextensions-configurator>=0.6.2
 allowlist_externals = env
 commands =
 	env
diff --git a/tutorials-jupyter/Tutorial 10 - Hypergraph Modularity and Clustering.ipynb b/tutorials/advanced/Tutorial 10 - Hypergraph Modularity and Clustering.ipynb
similarity index 100%
rename from tutorials-jupyter/Tutorial 10 - Hypergraph Modularity and Clustering.ipynb
rename to tutorials/advanced/Tutorial 10 - Hypergraph Modularity and Clustering.ipynb
diff --git a/tutorials/Tutorial 5 - s-Centrality.ipynb b/tutorials/advanced/Tutorial 5 - s-Centrality.ipynb
similarity index 100%
rename from tutorials/Tutorial 5 - s-Centrality.ipynb
rename to tutorials/advanced/Tutorial 5 - s-Centrality.ipynb
diff --git a/tutorials/Tutorial 6 - Homology mod 2 for TriLoop Example.ipynb b/tutorials/advanced/Tutorial 6 - Homology mod 2 for TriLoop Example.ipynb
similarity index 100%
rename from tutorials/Tutorial 6 - Homology mod 2 for TriLoop Example.ipynb
rename to tutorials/advanced/Tutorial 6 - Homology mod 2 for TriLoop Example.ipynb
diff --git a/tutorials-jupyter/Tutorial 7 - Laplacians and Clustering.ipynb b/tutorials/advanced/Tutorial 7 - Laplacians and Clustering.ipynb
similarity index 100%
rename from tutorials-jupyter/Tutorial 7 - Laplacians and Clustering.ipynb
rename to tutorials/advanced/Tutorial 7 - Laplacians and Clustering.ipynb
diff --git a/tutorials-jupyter/Tutorial 8 - Generative Models.ipynb b/tutorials/advanced/Tutorial 8 - Generative Models.ipynb
similarity index 100%
rename from tutorials-jupyter/Tutorial 8 - Generative Models.ipynb
rename to tutorials/advanced/Tutorial 8 - Generative Models.ipynb
diff --git a/tutorials-jupyter/Tutorial 9 - Contagion on Hypergraphs.ipynb b/tutorials/advanced/Tutorial 9 - Contagion on Hypergraphs.ipynb
similarity index 100%
rename from tutorials-jupyter/Tutorial 9 - Contagion on Hypergraphs.ipynb
rename to tutorials/advanced/Tutorial 9 - Contagion on Hypergraphs.ipynb
diff --git a/tutorials/Tutorial 1 - HNX Basics.ipynb b/tutorials/basic/Tutorial 1 - HNX Basics.ipynb
similarity index 100%
rename from tutorials/Tutorial 1 - HNX Basics.ipynb
rename to tutorials/basic/Tutorial 1 - HNX Basics.ipynb
diff --git a/tutorials/Tutorial 2 - Visualization Methods.ipynb b/tutorials/basic/Tutorial 2 - Visualization Methods.ipynb
similarity index 100%
rename from tutorials/Tutorial 2 - Visualization Methods.ipynb
rename to tutorials/basic/Tutorial 2 - Visualization Methods.ipynb
diff --git a/tutorials/Tutorial 3 - LesMis Case Study.ipynb b/tutorials/basic/Tutorial 3 - LesMis Case Study.ipynb
similarity index 100%
rename from tutorials/Tutorial 3 - LesMis Case Study.ipynb
rename to tutorials/basic/Tutorial 3 - LesMis Case Study.ipynb
diff --git a/tutorials/Tutorial 4 - LesMis Visualizations-BookTour.ipynb b/tutorials/basic/Tutorial 4 - LesMis Visualizations-BookTour.ipynb
similarity index 100%
rename from tutorials/Tutorial 4 - LesMis Visualizations-BookTour.ipynb
rename to tutorials/basic/Tutorial 4 - LesMis Visualizations-BookTour.ipynb
diff --git a/tutorials-jupyter/images/chunglu.png b/tutorials/images/chunglu.png
similarity index 100%
rename from tutorials-jupyter/images/chunglu.png
rename to tutorials/images/chunglu.png
diff --git a/tutorials-jupyter/images/clus_workflow.png b/tutorials/images/clus_workflow.png
similarity index 100%
rename from tutorials-jupyter/images/clus_workflow.png
rename to tutorials/images/clus_workflow.png
diff --git a/tutorials-jupyter/images/erdosrenyi.png b/tutorials/images/erdosrenyi.png
similarity index 100%
rename from tutorials-jupyter/images/erdosrenyi.png
rename to tutorials/images/erdosrenyi.png
diff --git a/tutorials-jupyter/images/genmodels_hypergraph.png b/tutorials/images/genmodels_hypergraph.png
similarity index 100%
rename from tutorials-jupyter/images/genmodels_hypergraph.png
rename to tutorials/images/genmodels_hypergraph.png
diff --git a/tutorials-jupyter/Demo 1 - HNXWidget.ipynb b/tutorials/widget/Demo 1 - HNXWidget.ipynb
similarity index 100%
rename from tutorials-jupyter/Demo 1 - HNXWidget.ipynb
rename to tutorials/widget/Demo 1 - HNXWidget.ipynb
diff --git a/tutorials-jupyter/Demo 2 - HNX Constructor and More Widget Examples.ipynb b/tutorials/widget/Demo 2 - HNX Constructor and More Widget Examples.ipynb
similarity index 100%
rename from tutorials-jupyter/Demo 2 - HNX Constructor and More Widget Examples.ipynb
rename to tutorials/widget/Demo 2 - HNX Constructor and More Widget Examples.ipynb