Move junk. Further Unix-ify