idiomatic in place edit
more idiomatic copy / mkdir
cleanup
Merge branch 'refactor/edit'