move some files to client directory, and start restructuring