Improved consistency of package layout and naming