Change helper paths to avoid duplicate requires