Reorganize pinlayout definitions.