move client code to sub dir