Merge "Merge & fix package names"