[IMP] refactor routes