Blog refactoring almost complete