FLUID-4907: refactoring builder.js

Refactoring based on conversation with Antranig, Cindy, and Yura. Changed names, and now operating under the assumption that you will always get an enhancer. Now the builder always generates an enhancerGrade and a consolidatedGrade. Unit tests still need to be fixed.