More restructure of the EeINS