Reord KDFs.
Cleanup
s/Helper/classes/