Minor refactoring
Add initial exchange session spec
Add new peer store datatype