Fix: Moved Helpers to correct namespace