Revert "New Scaffolding — Yeo"

This reverts commit 236026b9853d5e701b4b31d72182169f3abb7a22.