Major validation/card package refacs

Clean up generics / remove a bunch of them (they SUCK!)
Fix servlet issues