Moved resources around to forestall conflicts with debuggee
8 files changed