Restructured the notebook