created classes and renamed Calendar