refactor state manager to use URIs
Merge branch 'devel-interim' into atomicOutcome