Reworked search engine class layout