Fixing package of content_search classes
Merge pull request #1911 from daviddavis/temp_1365675606

Fixing package of content_search classes