merged entities.js into object.js