Move frontmatter into a directory, because we might need a few more things
Use six
Now a package, not a module