Revamp script

Make Class
Add yield to new_search
Clean script
Class renaming