moved some classes out of helpers package