Directory structure bug fix