split up esp in core and common