Clean up disk storage

Try and consolidate all disk loading/saving into one UI.