going to merge TotalSearch
merged code re-org into TotalSearch
Merge branch 'feature/TotalSearch' into develop