Fixed some Makefile errors and renamed builds/windows to builds/msvc