Corrected cell indexing and added initialization for new structures
Removed out_data_file_struct from put_data() call
Merge branch 'feature/reorg' into feature/image
wrapped put_data() calls