Package refactoring and @Alternative bean implementation.