Move analytics code to separate include
Merge pull request #133 from spl/reorg-analytics

Move analytics code to separate include