diff --git a/chapter_modern-convolutional-neural-networks/alexnet.md b/chapter_convolutional-modern/alexnet.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/alexnet.md
rename to chapter_convolutional-modern/alexnet.md
diff --git a/chapter_modern-convolutional-neural-networks/batch-norm.md b/chapter_convolutional-modern/batch-norm.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/batch-norm.md
rename to chapter_convolutional-modern/batch-norm.md
diff --git a/chapter_modern-convolutional-neural-networks/densenet.md b/chapter_convolutional-modern/densenet.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/densenet.md
rename to chapter_convolutional-modern/densenet.md
diff --git a/chapter_modern-convolutional-neural-networks/googlenet.md b/chapter_convolutional-modern/googlenet.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/googlenet.md
rename to chapter_convolutional-modern/googlenet.md
diff --git a/chapter_modern-convolutional-neural-networks/index.md b/chapter_convolutional-modern/index.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/index.md
rename to chapter_convolutional-modern/index.md
diff --git a/chapter_modern-convolutional-neural-networks/nin.md b/chapter_convolutional-modern/nin.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/nin.md
rename to chapter_convolutional-modern/nin.md
diff --git a/chapter_modern-convolutional-neural-networks/resnet.md b/chapter_convolutional-modern/resnet.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/resnet.md
rename to chapter_convolutional-modern/resnet.md
diff --git a/chapter_modern-convolutional-neural-networks/vgg.md b/chapter_convolutional-modern/vgg.md
similarity index 100%
rename from chapter_modern-convolutional-neural-networks/vgg.md
rename to chapter_convolutional-modern/vgg.md
diff --git a/chapter_linear-neural-networks/fashion-mnist.md b/chapter_linear-networks/fashion-mnist.md
similarity index 100%
rename from chapter_linear-neural-networks/fashion-mnist.md
rename to chapter_linear-networks/fashion-mnist.md
diff --git a/chapter_linear-neural-networks/index.md b/chapter_linear-networks/index.md
similarity index 100%
rename from chapter_linear-neural-networks/index.md
rename to chapter_linear-networks/index.md
diff --git a/chapter_linear-neural-networks/linear-regression-gluon.md b/chapter_linear-networks/linear-regression-gluon.md
similarity index 100%
rename from chapter_linear-neural-networks/linear-regression-gluon.md
rename to chapter_linear-networks/linear-regression-gluon.md
diff --git a/chapter_linear-neural-networks/linear-regression-scratch.md b/chapter_linear-networks/linear-regression-scratch.md
similarity index 100%
rename from chapter_linear-neural-networks/linear-regression-scratch.md
rename to chapter_linear-networks/linear-regression-scratch.md
diff --git a/chapter_linear-neural-networks/linear-regression.md b/chapter_linear-networks/linear-regression.md
similarity index 100%
rename from chapter_linear-neural-networks/linear-regression.md
rename to chapter_linear-networks/linear-regression.md
diff --git a/chapter_linear-neural-networks/softmax-regression-gluon.md b/chapter_linear-networks/softmax-regression-gluon.md
similarity index 100%
rename from chapter_linear-neural-networks/softmax-regression-gluon.md
rename to chapter_linear-networks/softmax-regression-gluon.md
diff --git a/chapter_linear-neural-networks/softmax-regression-scratch.md b/chapter_linear-networks/softmax-regression-scratch.md
similarity index 100%
rename from chapter_linear-neural-networks/softmax-regression-scratch.md
rename to chapter_linear-networks/softmax-regression-scratch.md
diff --git a/chapter_linear-neural-networks/softmax-regression.md b/chapter_linear-networks/softmax-regression.md
similarity index 100%
rename from chapter_linear-neural-networks/softmax-regression.md
rename to chapter_linear-networks/softmax-regression.md
diff --git a/chapter_optimization-algorithms/adadelta.md b/chapter_optimization/adadelta.md
similarity index 100%
rename from chapter_optimization-algorithms/adadelta.md
rename to chapter_optimization/adadelta.md
diff --git a/chapter_optimization-algorithms/adagrad.md b/chapter_optimization/adagrad.md
similarity index 100%
rename from chapter_optimization-algorithms/adagrad.md
rename to chapter_optimization/adagrad.md
diff --git a/chapter_optimization-algorithms/adam.md b/chapter_optimization/adam.md
similarity index 100%
rename from chapter_optimization-algorithms/adam.md
rename to chapter_optimization/adam.md
diff --git a/chapter_optimization-algorithms/convexity.md b/chapter_optimization/convexity.md
similarity index 100%
rename from chapter_optimization-algorithms/convexity.md
rename to chapter_optimization/convexity.md
diff --git a/chapter_optimization-algorithms/gd.md b/chapter_optimization/gd.md
similarity index 100%
rename from chapter_optimization-algorithms/gd.md
rename to chapter_optimization/gd.md
diff --git a/chapter_optimization-algorithms/index.md b/chapter_optimization/index.md
similarity index 100%
rename from chapter_optimization-algorithms/index.md
rename to chapter_optimization/index.md
diff --git a/chapter_optimization-algorithms/lr-scheduler.md b/chapter_optimization/lr-scheduler.md
similarity index 100%
rename from chapter_optimization-algorithms/lr-scheduler.md
rename to chapter_optimization/lr-scheduler.md
diff --git a/chapter_optimization-algorithms/minibatch-sgd.md b/chapter_optimization/minibatch-sgd.md
similarity index 100%
rename from chapter_optimization-algorithms/minibatch-sgd.md
rename to chapter_optimization/minibatch-sgd.md
diff --git a/chapter_optimization-algorithms/momentum.md b/chapter_optimization/momentum.md
similarity index 100%
rename from chapter_optimization-algorithms/momentum.md
rename to chapter_optimization/momentum.md
diff --git a/chapter_optimization-algorithms/optimization-intro.md b/chapter_optimization/optimization-intro.md
similarity index 100%
rename from chapter_optimization-algorithms/optimization-intro.md
rename to chapter_optimization/optimization-intro.md
diff --git a/chapter_optimization-algorithms/rmsprop.md b/chapter_optimization/rmsprop.md
similarity index 100%
rename from chapter_optimization-algorithms/rmsprop.md
rename to chapter_optimization/rmsprop.md
diff --git a/chapter_optimization-algorithms/sgd.md b/chapter_optimization/sgd.md
similarity index 100%
rename from chapter_optimization-algorithms/sgd.md
rename to chapter_optimization/sgd.md
diff --git a/chapter_modern-recurrent-neural-networks/beam-search.md b/chapter_recurrent-modern/beam-search.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/beam-search.md
rename to chapter_recurrent-modern/beam-search.md
diff --git a/chapter_modern-recurrent-neural-networks/bi-rnn.md b/chapter_recurrent-modern/bi-rnn.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/bi-rnn.md
rename to chapter_recurrent-modern/bi-rnn.md
diff --git a/chapter_modern-recurrent-neural-networks/deep-rnn.md b/chapter_recurrent-modern/deep-rnn.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/deep-rnn.md
rename to chapter_recurrent-modern/deep-rnn.md
diff --git a/chapter_modern-recurrent-neural-networks/encoder-decoder.md b/chapter_recurrent-modern/encoder-decoder.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/encoder-decoder.md
rename to chapter_recurrent-modern/encoder-decoder.md
diff --git a/chapter_modern-recurrent-neural-networks/gru.md b/chapter_recurrent-modern/gru.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/gru.md
rename to chapter_recurrent-modern/gru.md
diff --git a/chapter_modern-recurrent-neural-networks/index.md b/chapter_recurrent-modern/index.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/index.md
rename to chapter_recurrent-modern/index.md
diff --git a/chapter_modern-recurrent-neural-networks/lstm.md b/chapter_recurrent-modern/lstm.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/lstm.md
rename to chapter_recurrent-modern/lstm.md
diff --git a/chapter_modern-recurrent-neural-networks/machine-translation.md b/chapter_recurrent-modern/machine-translation.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/machine-translation.md
rename to chapter_recurrent-modern/machine-translation.md
diff --git a/chapter_modern-recurrent-neural-networks/seq2seq.md b/chapter_recurrent-modern/seq2seq.md
similarity index 100%
rename from chapter_modern-recurrent-neural-networks/seq2seq.md
rename to chapter_recurrent-modern/seq2seq.md
diff --git a/index.md b/index.md
index 9d88315f03..fa20e21f83 100644
--- a/index.md
+++ b/index.md
@@ -22,15 +22,15 @@ chapter_notation/index
 
 chapter_introduction/index
 chapter_preliminaries/index
-chapter_linear-neural-networks/index
+chapter_linear-networks/index
 chapter_multilayer-perceptrons/index
 chapter_deep-learning-computation/index
 chapter_convolutional-neural-networks/index
-chapter_modern-convolutional-neural-networks/index
+chapter_convolutional-modern/index
 chapter_recurrent-neural-networks/index
-chapter_modern-recurrent-neural-networks/index
+chapter_recurrent-modern/index
 chapter_attention-mechanisms/index
-chapter_optimization-algorithms/index
+chapter_optimization
 chapter_computational-performance/index
 chapter_computer-vision/index
 chapter_natural-language-processing/index