Added correct directory structure