Simplifies namespacing by renaming search file and changing code accordingly