Fixed issues #1 and #3: simplified project structure and fixed sln respectively.