Revert "Back to one class I guess"

This reverts commit d92f8458ef135a361239d203e669ac7d0d052007.