added Entity.cpp/.h