Refacotring of packages names