Refactoring and finish create project wizard