Refactored bonuses-estimating and other code, renamed files