Events
Some refactoring class names & threading & container cleanup