Update to show branch in meld path

Updated so that the branch name is in the meld path. Additionally, updated to make the cleanup easier since everything is in one directory.