Revert "24557 - moved project into new folder"

This reverts commit 19020a91922f128fd01de2f7991be8ab06dbfe4d.
Revert "Revert "24557 - moved project into new folder""

This reverts commit 12837a845be47e8ec17af04cac2c81334b44d57c.