rearrange classes to be used with classmap