Moved content to client package.
Merge remote-tracking branch 'origin/master'