Correct directory structure
Update directory structure