Reorganizing the common stuff
Reorganizing the common stuff