Moved Time class to flowutils, using ManualTime for unit tests now.
Some time related refactoring.
Updated todo.