Moved some classes into william cavendish
Merge pull request #11 from etothepii/develop

Moved some classes into william cavendish