separating out entity classes into separate files