Moar directory restructuring