Moved search_term.py into search.py
Moved search_term.py into search.py
Refactored search code into its own module