Just moved some classes so that they weren't cluttering up the services directory.  The refactor obviously causes all references to be updated.