moved entity classes into separate package