Moved some of classes to joda time classes