Moved time conversion into service object, restructed tables/model accordingly