Added new option structures for hmat
Updated file formattings