Fixed init event problem, organized objects