Routes package refactoring
Fixing some files