More refactoring work to make timezone a standalone cookbook