Move organize method out of the events controller