split search classes to different package