Revert "Extract classes"

This reverts commit 28df409e438b11b0265a205a450a233cd0a07015.