Small changes to project solution and structure