refactor, restructure routes