It seems that the engine package content is entirely related to query and should move somewhere under o.h.search.query. Any opinion or objection? Most are non API non SPI classes anyways.