Simplified one function services API. Issue: #370
Pull out search query generation as a separate service. Issue: #370
Reformatting
Break services up into individual files to make them more manageable. Issue: #370