Don't need two dirs anymore