Correct project structure and scripts