Directory layout cleanups.