[Entity & Task] Fix issue with entity and task files so that they can compile.
[Entity, Position, &Task] Renaming files (1/2)
[Entity, Position, & Task] Rename files (1/2)
[Entity & Task] Changed #includes to use new names.