More directory tweaking