WIP Reorg Sample

[# 49708866]