refactoring
Merge https://github.com/Amidovka/SimplePrediction