Added random routes and reorganized.