renamed ObjectData.java to Entity.java