Start re-organize new classes
Isolate the checkers
jdk7-style generic