Revert "Deleted unused classes"

This reverts commit b2ebc23fc10d197dec3030486bb4d55f2854bad7.