Merged Router into Main System