add/remove calls for Organizes and HasComponent