More Directory Cleanups