-Modification of all the packages, they are now more linears and
properly used