Added entity classes
Revert "Added entity classes"

This reverts commit adcb318a7d216aeae1a662442ef19cfb6f2b74a4.