Added domain event

Cleanup and apparently heaps of other files