Removing chapters and including sections directly
(cherry picked from commit 27bdafd2429227f30dc6c3556388f595d7a08081)