Sip endpoints finished - golint not run yet

can we keep all regexes at the top of the file so it's consistent across packages?