Small directory structure fixing