Rework of package structure
Merge