refactoring and uri changing