Moving stuff around, makes more sense for Smerk classes to be top level for Submods.