New organization routes and renamed all routes to make more sense