Broke out dir methods for diag movement some more.