Restructurered, branched terms to separate headers, predictor in separate header
Fixed namespace issues
Fixed options definitions