Cleaned the solution and project

This is really important, the files needed some cleaning.

Hopefully it's working with everyone!