Properly moved the files this time, touched the Makefile.Windows but not tested