Changes to match changes in directory structure
Fixes based on refactoring in Predictor