Moved modules out of helpers folder
Fixed broken module path