Accommodate for folder rename
Documentation and cleanup