restructued to (hopefully) what octopress expects