Now a method is defined in ComponentRequestRouter and in AbstractComponentSessionController to get the OrganizationController. Remove any use of the MainSessionController to get the OrganizationController; the code is replaced either by OrganizationControllerProvider#getOrganizationController() or by the inherited method getOrganizationController() (for request routers and for session controllers).