Fixed all the windows compile errors and project reorg with the exceptio...

...n of the more complex problem in Parser.cpp