Fix the setup build
Merge pull request #2607 from ogail/restructure

Fix the setup build