Organized plugins
Added search highlighting