Entities

Adding Entity class
Incorrectly ordered