Organise the routes again after making it ugly
Add named routes