can we collapse all these tiny classes into a single class file + inner classes? just to reduce the noise