Changed the EntityHolder classes package.