v2.3: separate cavity data, added comsol files