Simply changed the X and Y coords (of enities) to protected
Re-ordered some code
Updated some code structuring
Merge remote-tracking branch 'origin/npc-dev' into aside