swept everything related to eps into Cavity structure