Revert "Backup before change of package layout"

This reverts commit d1aaca34ccec8c0a3bdccc956f7f92bab4193ea1.