Switch organization back to org.pelotom