[#9] Moving routing logic into multipe files
[#9] Separating out routing logic tests