moved SHA-1 component to own file; other changes