Move to org.consort.panel