Refactoring and changes for new EnterpriseBeans package