Made changes to routes structure