More directory cleanups