restructure + added Pricing engine elements