Changed project structure, removed events.