Restructured file structure and classes. Added mapping type to support UTC times.