Minor fixes
Separate dir for routes