Fixed linker errors
Extracted Search Structure into a nice class