TimeTypes #167

- Reorganized
TimeTypes #167 BIG REWRITE