Fixes #632.
Fixed wrong class uses.
refactored helper organization.