Revert "Class Changes"

This reverts commit 269220c530c2996100d3bcc06570cc4448c96100.