This reverts commit 3c365338.

We want to keep the same structure than on Linux
Also the .pc files use this structure