Split up dispatcher from routing package