bug fix, changing directory structure