fixed helpers deprecation code in 1.0
organizing code with new helpers requirement
cleaned up and organized