The startup project gets set after the renaming. Some minor refactorings.