Added TODO list and seperated routers into seperate files