rename packages and move to more appropriate ones