change file paths to match new dir structure
also get tests to compile with x64
delete some flaky tests