integrated client part into ./client/