Update upstream packages, move classes around