Naive file save structure - version 2

Be able to save more than one naive file.