Update import paths

src/cells/model.ts

@@ -31,7 +31,7 @@ import {
 
 import {
   IMetadataCursor, MetadataCursor
-} from '../notebook/common/metadata';
+} from '../common/metadata';
 
 import {
   IOutputAreaModel, OutputAreaModel

src/cells/widget.ts

@@ -31,7 +31,7 @@ import {
 
 import {
   IMetadataCursor
-} from '../notebook/common/metadata';
+} from '../common/metadata';
 
 import {
   OutputAreaWidget

src/common/undoablevector.ts

@@ -9,13 +9,9 @@ import {
   each
 } from 'phosphor/lib/algorithm/iteration';
 
-import {
-  Vector
-} from 'phosphor/lib/collections/vector';
-
 import {
   IObservableVector, ObservableVector
-} from '../../common/observablevector';
+} from './observablevector';
 
 
 /**

src/notebook/actions.ts

@@ -20,7 +20,7 @@ import {
 import {
   ICellModel, ICodeCellModel,
   CodeCellWidget, BaseCellWidget, MarkdownCellWidget
-} from '../../cells';
+} from '../cells';
 
 import {
   INotebookModel

src/notebook/default-toolbar.ts

@@ -19,14 +19,14 @@ import {
 
 import {
   ToolbarButton
-} from '../../toolbar';
+} from '../toolbar';
 
 import {
   createInterruptButton,
   createRestartButton,
   createKernelNameItem,
   createKernelStatusItem
-} from '../../toolbar/kernel';
+} from '../toolbar/kernel';
 
 import {
   Notebook

src/notebook/model.ts

@@ -23,20 +23,20 @@ import {
 
 import {
   IObservableVector, ObservableVector
-} from '../../common/observablevector';
+} from '../common/observablevector';
 
 import {
   DocumentModel, DocumentRegistry
-} from '../../docregistry';
+} from '../docregistry';
 
 import {
   ICellModel, ICodeCellModel, IRawCellModel, IMarkdownCellModel,
   CodeCellModel, RawCellModel, MarkdownCellModel, CellModel
-} from '../../cells/model';
+} from '../cells/model';
 
 import {
   IChangedArgs
-} from '../../common/interfaces';
+} from '../common/interfaces';
 
 import {
   IMetadataCursor, MetadataCursor
@@ -44,7 +44,7 @@ import {
 
 import {
   IObservableUndoableVector, ObservableUndoableVector
-} from '../common/undo';
+} from '../common/undoablevector';
 
 
 /**

src/notebook/modelfactory.ts

@@ -7,11 +7,11 @@ import {
 
 import {
   DocumentRegistry
-} from '../../docregistry';
+} from '../docregistry';
 
 import {
   CodeCellModel
-} from '../../cells';
+} from '../cells';
 
 import {
   INotebookModel, NotebookModel

src/notebook/panel.ts

@@ -29,46 +29,46 @@ import {
   Widget
 } from 'phosphor/lib/ui/widget';
 
+import {
+  BaseCellWidget, CodeCellWidget
+} from '../cells';
+
 import {
   IEditorMimeTypeService, CodeEditor
-} from '../../codeeditor';
+} from '../codeeditor';
+
+import {
+  CompleterModel, CompleterWidget, CompletionHandler
+} from '../completer';
 
 import {
   IChangedArgs
-} from '../../common/interfaces';
+} from '../common/interfaces';
 
 import {
   DocumentRegistry
-} from '../../docregistry';
+} from '../docregistry';
 
 import {
   InspectionHandler
-} from '../../inspector';
-
-import {
-  RenderMime
-} from '../../rendermime';
+} from '../inspector';
 
 import {
-  CompleterModel, CompleterWidget, CompletionHandler
-} from '../../completer';
+  OutputAreaWidget
+} from '../outputarea';
 
 import {
-  BaseCellWidget, CodeCellWidget
-} from '../../cells';
+  RenderMime
+} from '../rendermime';
 
 import {
-  OutputAreaWidget
-} from '../../outputarea';
+  Toolbar
+} from '../toolbar';
 
 import {
   INotebookModel
 } from './model';
 
-import {
-  Toolbar
-} from '../../toolbar';
-
 import {
   Notebook
 } from './widget';

src/notebook/trust.ts

@@ -3,7 +3,7 @@
 
 import {
   showDialog, okButton, cancelButton, warnButton
-} from '../../dialog';
+} from '../dialog';
 
 import {
   INotebookModel

src/notebook/widget.ts

@@ -51,33 +51,33 @@ import {
 
 import {
   IChangedArgs
-} from '../../common/interfaces';
+} from '../common/interfaces';
 
 import {
   DragScrollHandler
-} from '../../common/dragscroll';
+} from '../common/dragscroll';
 
 import {
   IObservableVector, ObservableVector
-} from '../../common/observablevector';
+} from '../common/observablevector';
 
 import {
   RenderMime
-} from '../../rendermime';
+} from '../rendermime';
 
 import {
   IEditorMimeTypeService, CodeEditor
-} from '../../codeeditor';
+} from '../codeeditor';
 
 import {
   ICellModel, BaseCellWidget, IMarkdownCellModel,
   CodeCellWidget, MarkdownCellWidget,
   ICodeCellModel, RawCellWidget, IRawCellModel,
-} from '../../cells';
+} from '../cells';
 
 import {
   OutputAreaWidget
-} from '../../outputarea';
+} from '../outputarea';
 
 import {
   INotebookModel

src/notebook/widgetfactory.ts

@@ -7,15 +7,15 @@ import {
 
 import {
   IEditorMimeTypeService
-} from '../../codeeditor';
+} from '../codeeditor';
 
 import {
   ABCWidgetFactory, DocumentRegistry
-} from '../../docregistry';
+} from '../docregistry';
 
 import {
   RenderMime
-} from '../../rendermime';
+} from '../rendermime';
 
 import {
   ToolbarItems