TimeTypes #167 #150

- Reorganized