Fixed java.util.Date support
Refactoring class names and stuff...