Backups storage

Add a backups archive storage abstraction and do a little cleanup.
Good comment. I've had other reviewers incorrectly complain about this before :)