Code for analytics moved to more meaningful dir