Revert "Remove unneeded and outdated classes"

This reverts commit 1bcbd843e7514a0b99f4d5872aeadb5bac9f03d8.