Move analytics in a different package