First pass on modularizing create-dir/transfer/cleanup