Refactor Welcome/New Project code.