Moar directory fixing