Baseline Model Refactored

Completed Refactoring - Oil and Gold in same file