Finished new directory processing changes