Move 'basic' class helpers to separate module