Adds changes from Adam re: CostForm, realcost calc and service and form folders