Multiple changes.

Removed search highlighter, style fine-tuning, file reorganization.