Update to modularize router + pipeline