move entities to core