Ignore massif output files
Fix Boost issue
Rename
Rename
Improve struct_def
Start merging