#419, #420: adjust directory