Changed router to reflect changes with the Locator object that's now in the library/ folder.