renaming packages
adding multiple troop types, new upgrade moves
fixed conflicts