Added Entity as base class, and move old entity to Actor, working on Emitter