Move some routing into sub modules