Change of structure (to acommodate that built formula can return any necessary construct).  Modified unit tests to accomodate.
Directory restructing. Successful formula generation using TestFormulaBuilder.