Simplified timezone classes and removed base class