Removed the arbitrary nesting from routes