Correct scripts and project structure