More 2.0 stuff -- fix workspace, remove 1.6 files
3 files changed