Static factory registration workaround.
Further work on source reorg and naming.