analytics: put them into the proper location.