Rationalise packages/ / tidy up