Reorganizing again, adding static libraries and includes
for both 32/64 bit windows