Fixed package names.
Last changes made to support generics.