Revert "Unused classes deleted."

This reverts commit 8ded64c2e5b59cee70c0f4cf9783864af9a0266f.