partially finshed Routing rules refactor
90% completed changes on routing rules