cleanup code
+ @Override
+ Java 7 redundent generic type declerations removed
new interfaces: named & namefull
dependencies fixed again