reorganize shapes yaml storage