Fixed a bunch of changes while migrating a bunch of files around the directory structure.
A little bit of cleanup on the search core and BFS/DFS.