More cleanup. Get Windows to compile.
Rename the legacy files a bit.