Conform to new core changes.
Moved classes to client package.