golden: Fix organization