re-organize package-structure for entities => some little fixes.