de-picling due to recent repo rename

A couple picl's remain, but I'll file separate bugs as they are less straight forward.

Partially fixes Issue #310