Move Transport and TimeScale into the model layer.