Shuffle a few bits and pieces into directories.