Reorganize 2008 and 2009 into new structure.