Added client support
Some moving of files