Move product usage in its own group