The structure and evolution of X-ray clusters