Package refactoring. Preparing 2.6.0.CR3.