Heavy refactoring to clean up the code. In particular the start of
changes around blogging to secondary blogs.