Reorganized classes into core and suffix modules