Standarising the packages