Fix up mv and rm commands

Should address issue #17