Move helper classes to helper module