Revert "Main changed and new class added."

This reverts commit 5392ab4779c25f179fc16557692a61c63e23477d.