Merged duplicated classes into `Client Commons`

Fixed resulting errors