diff --git a/notebooks/book2/07/advi_beta_binom.ipynb b/notebooks/book2/inf/advi_beta_binom.ipynb
similarity index 100%
rename from notebooks/book2/07/advi_beta_binom.ipynb
rename to notebooks/book2/inf/advi_beta_binom.ipynb
diff --git a/notebooks/book2/07/advi_beta_binom_pymc.ipynb b/notebooks/book2/inf/advi_beta_binom_pymc.ipynb
similarity index 100%
rename from notebooks/book2/07/advi_beta_binom_pymc.ipynb
rename to notebooks/book2/inf/advi_beta_binom_pymc.ipynb
diff --git a/notebooks/book2/07/hmc_beta_binom.ipynb b/notebooks/book2/inf/hmc_beta_binom.ipynb
similarity index 100%
rename from notebooks/book2/07/hmc_beta_binom.ipynb
rename to notebooks/book2/inf/hmc_beta_binom.ipynb
diff --git a/notebooks/book2/06/gauss_imputation_em_demo.ipynb b/notebooks/book2/opt/gauss_imputation_em_demo.ipynb
similarity index 100%
rename from notebooks/book2/06/gauss_imputation_em_demo.ipynb
rename to notebooks/book2/opt/gauss_imputation_em_demo.ipynb
diff --git a/notebooks/book2/06/gradient_expected_value_gaussian.ipynb b/notebooks/book2/opt/gradient_expected_value_gaussian.ipynb
similarity index 100%
rename from notebooks/book2/06/gradient_expected_value_gaussian.ipynb
rename to notebooks/book2/opt/gradient_expected_value_gaussian.ipynb
diff --git a/notebooks/book2/06/nat_grad_demo.ipynb b/notebooks/book2/opt/nat_grad_demo.ipynb
similarity index 100%
rename from notebooks/book2/06/nat_grad_demo.ipynb
rename to notebooks/book2/opt/nat_grad_demo.ipynb
diff --git a/notebooks/book2/06/simulated_annealing_2d_demo.ipynb b/notebooks/book2/opt/simulated_annealing_2d_demo.ipynb
similarity index 100%
rename from notebooks/book2/06/simulated_annealing_2d_demo.ipynb
rename to notebooks/book2/opt/simulated_annealing_2d_demo.ipynb
diff --git a/notebooks/book2/06/var_em_bound.ipynb b/notebooks/book2/opt/var_em_bound.ipynb
similarity index 100%
rename from notebooks/book2/06/var_em_bound.ipynb
rename to notebooks/book2/opt/var_em_bound.ipynb