Move all statistics to a separate package