Fix Javadoc to remove .security. from package names
Cleanup Generics

Fixes #3