More directory wizardry. Finally organized well.