diff --git a/src/draggable/node-draggable.service.ts b/src/draggable/node-draggable.service.ts
index 8f57818f..3d53c839 100644
--- a/src/draggable/node-draggable.service.ts
+++ b/src/draggable/node-draggable.service.ts
@@ -1,5 +1,5 @@
 import { ElementRef, Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { CapturedNode } from './captured-node';
 import { NodeDraggableEvent } from './draggable.events';
 
diff --git a/src/menu/node-menu.service.ts b/src/menu/node-menu.service.ts
index 3abaf52e..06f3207b 100644
--- a/src/menu/node-menu.service.ts
+++ b/src/menu/node-menu.service.ts
@@ -1,6 +1,5 @@
 import { ElementRef, Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
-import { Observable } from 'rxjs/Observable';
+import { Subject ,  Observable } from 'rxjs';
 import { NodeMenuAction, NodeMenuEvent } from './menu.events';
 
 @Injectable()
diff --git a/src/tree-internal.component.ts b/src/tree-internal.component.ts
index 1da00de3..c7442ddc 100644
--- a/src/tree-internal.component.ts
+++ b/src/tree-internal.component.ts
@@ -22,7 +22,7 @@ import { NodeCheckedEvent, NodeEvent } from './tree.events';
 import { TreeService } from './tree.service';
 import * as EventUtils from './utils/event.utils';
 import { NodeDraggableEvent } from './draggable/draggable.events';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 import { get, isNil } from './utils/fn.utils';
 
 @Component({
diff --git a/src/tree.component.ts b/src/tree.component.ts
index d7e80f75..be0af38f 100644
--- a/src/tree.component.ts
+++ b/src/tree.component.ts
@@ -19,7 +19,7 @@ import { MenuItemSelectedEvent, NodeCheckedEvent, NodeEvent, NodeUncheckedEvent
 
 import { Tree } from './tree';
 import { TreeController } from './tree-controller';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'tree',
diff --git a/src/tree.service.ts b/src/tree.service.ts
index 108a0db8..201060cf 100644
--- a/src/tree.service.ts
+++ b/src/tree.service.ts
@@ -16,8 +16,7 @@ import {
 import { RenamableNode } from './tree.types';
 import { Tree } from './tree';
 import { TreeController } from './tree-controller';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable ,  Subject } from 'rxjs';
 import { ElementRef, Inject, Injectable } from '@angular/core';
 import { NodeDraggableService } from './draggable/node-draggable.service';
 import { NodeDraggableEvent } from './draggable/draggable.events';
diff --git a/src/tree.ts b/src/tree.ts
index 65e82c15..bba67638 100644
--- a/src/tree.ts
+++ b/src/tree.ts
@@ -1,7 +1,6 @@
 import { defaultsDeep, get, has, includes, isEmpty, isFunction, isNil, omit, once, size, trim } from './utils/fn.utils';
 
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import { Observable ,  Observer } from 'rxjs';
 import {
   ChildrenLoadingFunction,
   FoldingType,
diff --git a/test/draggable/node-draggable.service.spec.ts b/test/draggable/node-draggable.service.spec.ts
index 19cfa2ca..6a6ba422 100644
--- a/test/draggable/node-draggable.service.spec.ts
+++ b/test/draggable/node-draggable.service.spec.ts
@@ -1,5 +1,5 @@
 import { inject, TestBed } from '@angular/core/testing';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { NodeDraggableService } from '../../src/draggable/node-draggable.service';
 import { CapturedNode } from '../../src/draggable/captured-node';
 import { ElementRef } from '@angular/core';
diff --git a/test/menu/node-menu.service.spec.ts b/test/menu/node-menu.service.spec.ts
index cf5f50a0..640cc6d3 100644
--- a/test/menu/node-menu.service.spec.ts
+++ b/test/menu/node-menu.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NodeMenuService } from '../../src/menu/node-menu.service';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { ElementRef } from '@angular/core';
 import { NodeMenuEvent, NodeMenuAction } from '../../src/menu/menu.events';
 
diff --git a/test/tree.service.spec.ts b/test/tree.service.spec.ts
index 510aa0c5..aae72a04 100644
--- a/test/tree.service.spec.ts
+++ b/test/tree.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { TreeService } from '../src/tree.service';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { NodeDraggableService } from '../src/draggable/node-draggable.service';
 import { Tree } from '../src/tree';
 import {