Create new chapter structure

Router unit test fixed and other chapters changed to the new chapter structure