Restructure ready for list and restore modes
Added list mode
Added restore capability