Revert "Use newer site layout"

This reverts commit 80e6fb2d503c39123aae514cd29ca3707c5ff7c5.
17 files changed