[dist] Some content reorganization.