Revert "WIP, reactor not working (segfault?)"

This reverts commit d869b437366751b0757d19775cf300ce00f32645.
Updated Makefile and event working with factories