[#71587328] Updating repo structure to address PR comments.