Rename client -> common