Add routes
Rearranged directories once again