Fix .gitignore and folder structure

This patch rebuilds the .gitignore file and puts the solution files in the right places.