separate branch to check build branches
clean up a bit
new classes for prediction model generalisation
Merge remote-tracking branch 'origin/cleanup'