Reorganized content hierarchy so GH page rendering works.