separated Entity into its own file