Finished the move-to-dir side of script, unified functions under trenort-cleanup.sh