Restructure
Restructure Routes and Handlers