Partly revert  last commit: Need to keep the entries w/o `%dir`

Otherwise the files would not be packages. So I over-celaned in the last
change.