Restructured content to work better with jekyll