Adopt scripts to new project structure