Further refactoring of packages in the other wars