removed o.oo package
consolidated part of the structure for duplicate packages