Reverted recent commits that break the website structure

If you would be willing to do pull requests for each of these changes, we can make sure that nothing gets broken along the way