Modularize routing