Revert "Deleted target classes commited by mistake"

This reverts commit 4cb63faa9c06cbaf2554da78dea2297a67d98916.