Restructure some packages with symlinks