Created Company scaffold to replace/combine Chainstores and Contractors. Recreated Partnership scaffold.