Split activtiylog into two modules