Some small refactorings. Tried to change the startup project.