Remove extra whitespace
Re-organize search modules under a single search module