Making this a maven module - more files
Generics moved to new module