Added support for Windows environment

(with project cleanup)