Moved Analytics to the proper place