Katja's suggestions noted in graphic
Removed old dir