Completed: Done refactoring SearchEngine project