Split entity into own file

Prep for some functionality that needs adding to Entity
Meant a change across all classes