Backups storage

Add a backups archive storage abstraction and do a little cleanup.
Good catch.