Revert "Class was re-designed"

This reverts commit fda5d1d7f6cff30413c11d08c1a2c04c43dda87e.