Draft: Dependency updates, refactor directories
Started splitting functionality into smaller methods. Added missing functionality of performing narrowed searches.
Started splitting functionality into smaller methods. Added missing functionality of performing narrowed searches.