Update version
Packages reorganization