Fix handling of expired backups.
Move similar modules into separate subpackages.