move client entirely to its own dir