Use correct directory structure