Add more stuff. Set up per-system subdirs.