Some refactoring and new project wizard implementation