restructure OrganizerTest