Moves activity provider to separate files
Unifies event filling