cleanup organization in Layout.Base and Layout.Dense to improve quality of haddocks