Start fixing organization
Add search_logic in charge of search
pep8 fixes