Revert "Initial conversion to a new layout"

This reverts commit cc0b7030531b8608c1c173f340710af279370b7c.