Better organization for customization-spec code