(cherry picked from commit 9a761a4fc8f0b07c6162e334b34c69ddd9c754e8)
For consistency. Now all packages will have their own subdirectory (continuation of 781e69d19c).
781e69d19c