Revert "New Classes"

This reverts commit d22fbcccb20d9d6342a0aaacaa5489416b8699ee.
Revert "Revert "New Classes""

This reverts commit a61df233e6916065372e5ce5283433e59fe3b07f.