Moved some classes into william cavendish