re-organize package-structure for entities => move all to one package