Cleanup
More cleanup
reworking repo/eventstore interfaces

reworking the repository and eventstore interfaces