Moved some stuff around and got build tool working on win 7.