TimeTypes #167

- Reorganized