Added query related classes, changed config, added solr related config, etc. More refactoring and test cases to come