refactor (remove old classes)
Merge remote-tracking branch 'origin/offering_demo' into offering_demo