cleanup
move persistent registry to source, move Persistence into entities