More cleanup of top-level directory.