Moving Thinhs stuff into client/*