Refactor the object version of pigeon organizer