Refactory of packages