More directory restructures.