Refactor tzinfo classes