Move EE helper to proper namespace

Merged username-removed-128633 requested to merge fix-ee-master into master