renamed object.h/cpp to entity.h/cpp