Split files into public and private

Card: Analytics 1253
Change-Id: Ib5e50b8281992c19bfb95d77bbafc3629cf50924