fixing package and duplicate entities