Genericised the java package namespace