Further directory cleanups.
Directory cleanup completed (for the moment).