Revert "Refactored S to C"

This reverts commit 37c954f49262819253bb592f937cd78e7ae4cb7b.
Revert "OOPS forgot to do git add ."

This reverts commit 8a6b1785b013807d631e8e722a8a60772569f80e.
After coming back to this project, I see how overly complicated the new yaml format.