Rename Prediction to TimePrediction, add IPrediction
TimePrediction implements IPrediction
Change references to TimePrediction to IPrediction. Other minor changes