Applied new changes to new search file structure