Refactors to use Routes from Common module