refactoring
tests for persistence
launch orchestration refactoring