Directory structure tweak