Change to classes to fit with each other
Merge branch 'master' of https://github.com/shanson82/SearchEngineV2