Restructured and Added Windows Support