Begin restructuring for eventual search engine