Moses: re-organize the boosting code

The pre scorer has multiple boosting-related bugs.  The re-organization is needed to fix these.