Refactoring done. Plan for full year integration