Make the right directory early...