Refactoring and release rc2