Main class, and test class added. Default classes removed.