Move ContentHelper back to ApplicationHelper