Split the analytics off in a submodule