Identity persistence to file, small cleanup, all data now stored in folder 'data'