Moved some Class stuff, fixed some things
Merge pull request #202 from Dgby714/LapeClasses

Moved some Class stuff, fixed some things