Convert articles into a package.

This isn't a very pretty merge, but then renames don't often go smoothly anyway.