Fixed project directory structure and SLN