update package naming
improve entity mapping @ManyToOne