Packages reorganization