Refactored / merged subsections and updated routing