intermed #1
fix persistence
new multimodule structure