Fix so project can only be setup when there is a project + small refactoring