diff --git a/package.json b/package.json
index 8d3cb9d50..dfb5353b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "box-annotations",
-  "version": "0.0.0",
+  "version": "0.0.8",
   "description": "Box Annotations",
   "author": "Box (https://www.box.com/)",
   "license": "SEE LICENSE IN LICENSE",
diff --git a/src/AnnotationDialog.js b/src/AnnotationDialog.js
index 6633d62b3..82a31707d 100644
--- a/src/AnnotationDialog.js
+++ b/src/AnnotationDialog.js
@@ -2,7 +2,7 @@ import autobind from 'autobind-decorator';
 import EventEmitter from 'events';
 import * as annotatorUtil from './annotatorUtil';
 import * as constants from './annotationConstants';
-import { ICON_CLOSE, ICON_DELETE } from '../icons/icons';
+import { ICON_CLOSE, ICON_DELETE } from './icons/icons';
 
 const POINT_ANNOTATION_ICON_HEIGHT = 31;
 const POINT_ANNOTATION_ICON_DOT_HEIGHT = 8;
diff --git a/src/AnnotationThread.js b/src/AnnotationThread.js
index 5b89810ac..137203b38 100644
--- a/src/AnnotationThread.js
+++ b/src/AnnotationThread.js
@@ -3,7 +3,7 @@ import autobind from 'autobind-decorator';
 import Annotation from './Annotation';
 import AnnotationService from './AnnotationService';
 import * as annotatorUtil from './annotatorUtil';
-import { ICON_PLACED_ANNOTATION } from '../icons/icons';
+import { ICON_PLACED_ANNOTATION } from './icons/icons';
 import {
     STATES,
     TYPES,
diff --git a/src/Annotator.js b/src/Annotator.js
index 6d3d0efa6..9256d4605 100644
--- a/src/Annotator.js
+++ b/src/Annotator.js
@@ -2,7 +2,7 @@ import EventEmitter from 'events';
 import autobind from 'autobind-decorator';
 import AnnotationService from './AnnotationService';
 import * as annotatorUtil from './annotatorUtil';
-import { ICON_CLOSE } from '../icons/icons';
+import { ICON_CLOSE } from './icons/icons';
 import './Annotator.scss';
 import {
     CLASS_ACTIVE,
diff --git a/src/Annotator.scss b/src/Annotator.scss
index 1baaefe9e..d78811829 100644
--- a/src/Annotator.scss
+++ b/src/Annotator.scss
@@ -1,4 +1,5 @@
-@import '../boxuiVariables';
+@import 'boxui';
+@import 'boxuiVariables';
 
 $highlight-yellow: #fed94e;
 $highlight-yellow-active-hover: #ffc900;
@@ -450,6 +451,8 @@ $tablet: 'max-width: 768px';
 
         &:hover {
             color: $better-black;
+            padding: 8px;
+            padding-left: 4px;
         }
     }
 
diff --git a/src/BoxAnnotations.js b/src/BoxAnnotations.js
index 7351ef108..2a9bebbaa 100644
--- a/src/BoxAnnotations.js
+++ b/src/BoxAnnotations.js
@@ -3,6 +3,7 @@ import ImageAnnotator from './image/ImageAnnotator';
 import DrawingModeController from './drawing/DrawingModeController';
 import { TYPES } from './annotationConstants';
 import { canLoadAnnotations } from './annotatorUtil';
+import './Annotator.scss';
 
 /**
  * NAME: The name of the annotator.
@@ -130,5 +131,4 @@ class BoxAnnotations {
     }
 }
 
-global.BoxAnnotations = BoxAnnotations;
 export default BoxAnnotations;
diff --git a/src/MobileAnnotator.scss b/src/MobileAnnotator.scss
index b2ea2ffe0..dc2e15070 100644
--- a/src/MobileAnnotator.scss
+++ b/src/MobileAnnotator.scss
@@ -1,4 +1,4 @@
-@import '../_boxuiVariables';
+@import 'boxuiVariables';
 
 $tablet: "(min-width: 768px)";
 
diff --git a/src/__tests__/AnnotationDialog-test.js b/src/__tests__/AnnotationDialog-test.js
index db0dae489..4bf148174 100644
--- a/src/__tests__/AnnotationDialog-test.js
+++ b/src/__tests__/AnnotationDialog-test.js
@@ -16,13 +16,13 @@ let dialog;
 const sandbox = sinon.sandbox.create();
 let stubs = {};
 
-describe('lib/annotations/AnnotationDialog', () => {
+describe('AnnotationDialog', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/__tests__/AnnotationDialog-test.html');
+        fixture.load('__tests__/AnnotationDialog-test.html');
 
         dialog = new AnnotationDialog({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/__tests__/AnnotationModeController-test.js b/src/__tests__/AnnotationModeController-test.js
index ca6cb6bfc..7b71c7d4b 100644
--- a/src/__tests__/AnnotationModeController-test.js
+++ b/src/__tests__/AnnotationModeController-test.js
@@ -6,7 +6,7 @@ let annotationModeController;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/AnnotationModeController', () => {
+describe('AnnotationModeController', () => {
     beforeEach(() => {
         annotationModeController = new AnnotationModeController();
         stubs = {};
diff --git a/src/__tests__/AnnotationService-test.js b/src/__tests__/AnnotationService-test.js
index e7e7199fa..0e993c711 100644
--- a/src/__tests__/AnnotationService-test.js
+++ b/src/__tests__/AnnotationService-test.js
@@ -1,6 +1,5 @@
 /* eslint-disable no-unused-expressions */
 import fetchMock from 'fetch-mock';
-import '../../polyfill';
 import Annotation from '../Annotation';
 import AnnotationService from '../AnnotationService';
 
@@ -9,7 +8,7 @@ const API_HOST = 'https://app.box.com/api';
 let annotationService;
 let sandbox;
 
-describe('lib/annotations/AnnotationService', () => {
+describe('AnnotationService', () => {
     beforeEach(() => {
         sandbox = sinon.sandbox.create();
         annotationService = new AnnotationService({
diff --git a/src/__tests__/AnnotationThread-test.js b/src/__tests__/AnnotationThread-test.js
index ce447f380..18411d825 100644
--- a/src/__tests__/AnnotationThread-test.js
+++ b/src/__tests__/AnnotationThread-test.js
@@ -16,13 +16,13 @@ let thread;
 const sandbox = sinon.sandbox.create();
 let stubs = {};
 
-describe('lib/annotations/AnnotationThread', () => {
+describe('AnnotationThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/__tests__/AnnotationThread-test.html');
+        fixture.load('__tests__/AnnotationThread-test.html');
 
         thread = new AnnotationThread({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/__tests__/Annotator-test.js b/src/__tests__/Annotator-test.js
index 82f567e24..397d7a02a 100644
--- a/src/__tests__/Annotator-test.js
+++ b/src/__tests__/Annotator-test.js
@@ -23,13 +23,13 @@ let annotator;
 let stubs = {};
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/Annotator', () => {
+describe('Annotator', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/__tests__/Annotator-test.html');
+        fixture.load('__tests__/Annotator-test.html');
 
         const options = {
             annotator: {
diff --git a/src/__tests__/BoxAnnotations-test.js b/src/__tests__/BoxAnnotations-test.js
index c9187a108..935b52e2a 100644
--- a/src/__tests__/BoxAnnotations-test.js
+++ b/src/__tests__/BoxAnnotations-test.js
@@ -8,7 +8,7 @@ let loader;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotators/BoxAnnotations', () => {
+describe('BoxAnnotations', () => {
     beforeEach(() => {
         stubs = {};
         loader = new BoxAnnotations();
diff --git a/src/__tests__/CommentBox-test.js b/src/__tests__/CommentBox-test.js
index b3fb1b348..af6de4010 100644
--- a/src/__tests__/CommentBox-test.js
+++ b/src/__tests__/CommentBox-test.js
@@ -6,7 +6,7 @@ import {
     SELECTOR_ANNOTATION_BUTTON_POST
 } from '../annotationConstants';
 
-describe('lib/annotations/CommentBox', () => {
+describe('CommentBox', () => {
     const sandbox = sinon.sandbox.create();
     let commentBox;
     let parentEl;
diff --git a/src/__tests__/annotatorUtil-test.js b/src/__tests__/annotatorUtil-test.js
index c331d4729..81a8301d0 100644
--- a/src/__tests__/annotatorUtil-test.js
+++ b/src/__tests__/annotatorUtil-test.js
@@ -43,16 +43,16 @@ const DIALOG_WIDTH = 81;
 const sandbox = sinon.sandbox.create();
 let stubs = {};
 
-describe('lib/annotations/annotatorUtil', () => {
+describe('annotatorUtil', () => {
     let childEl;
     let parentEl;
 
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/__tests__/annotatorUtil-test.html');
+        fixture.load('__tests__/annotatorUtil-test.html');
 
         childEl = document.querySelector('.child');
         parentEl = document.querySelector('.parent');
diff --git a/src/doc/CreateHighlightDialog.js b/src/doc/CreateHighlightDialog.js
index 7c3f33ec4..8198b766a 100644
--- a/src/doc/CreateHighlightDialog.js
+++ b/src/doc/CreateHighlightDialog.js
@@ -1,5 +1,5 @@
 import EventEmitter from 'events';
-import { ICON_HIGHLIGHT, ICON_HIGHLIGHT_COMMENT } from '../../icons/icons';
+import { ICON_HIGHLIGHT, ICON_HIGHLIGHT_COMMENT } from '../icons/icons';
 import CommentBox from '../CommentBox';
 import { hideElement, showElement, generateBtn } from '../annotatorUtil';
 import * as constants from '../annotationConstants';
diff --git a/src/doc/DocAnnotator.js b/src/doc/DocAnnotator.js
index e4476cce8..4c41d9cd6 100644
--- a/src/doc/DocAnnotator.js
+++ b/src/doc/DocAnnotator.js
@@ -1,6 +1,6 @@
 import rangy from 'rangy';
 /* eslint-disable no-unused-vars */
-// Workaround for rangy npm issue: https://github.com/timdown/rangy/issues/342
+// Workaround for rangy npm issue: https://github.com/timdown/rangy/lib/issues/342
 import rangyClassApplier from 'rangy/lib/rangy-classapplier';
 import rangyHighlight from 'rangy/lib/rangy-highlighter';
 import rangySaveRestore from 'rangy/lib/rangy-selectionsaverestore';
diff --git a/src/doc/DocDrawingDialog.js b/src/doc/DocDrawingDialog.js
index 3cb51b198..e021eef74 100644
--- a/src/doc/DocDrawingDialog.js
+++ b/src/doc/DocDrawingDialog.js
@@ -1,7 +1,7 @@
 import AnnotationDialog from '../AnnotationDialog';
 import * as annotatorUtil from '../annotatorUtil';
 import * as constants from '../annotationConstants';
-import { ICON_DRAW_SAVE, ICON_DRAW_DELETE } from '../../icons/icons';
+import { ICON_DRAW_SAVE, ICON_DRAW_DELETE } from '../icons/icons';
 
 class DocDrawingDialog extends AnnotationDialog {
     /** @property {boolean} Whether or not the dialog is visible */
diff --git a/src/doc/DocHighlightDialog.js b/src/doc/DocHighlightDialog.js
index 0d82671dd..3a57daddf 100644
--- a/src/doc/DocHighlightDialog.js
+++ b/src/doc/DocHighlightDialog.js
@@ -2,7 +2,7 @@ import autobind from 'autobind-decorator';
 import AnnotationDialog from '../AnnotationDialog';
 import * as annotatorUtil from '../annotatorUtil';
 import * as docAnnotatorUtil from './docAnnotatorUtil';
-import { ICON_HIGHLIGHT, ICON_HIGHLIGHT_COMMENT } from '../../icons/icons';
+import { ICON_HIGHLIGHT, ICON_HIGHLIGHT_COMMENT } from '../icons/icons';
 import * as constants from '../annotationConstants';
 
 const CLASS_HIGHLIGHT_DIALOG = 'bp-highlight-dialog';
diff --git a/src/doc/__tests__/CreateHighlightDialog-test.js b/src/doc/__tests__/CreateHighlightDialog-test.js
index 3821f75ba..bacbadb07 100644
--- a/src/doc/__tests__/CreateHighlightDialog-test.js
+++ b/src/doc/__tests__/CreateHighlightDialog-test.js
@@ -11,7 +11,7 @@ import * as annotatorUtil from '../../annotatorUtil';
 
 const CLASS_CREATE_DIALOG = 'bp-create-annotation-dialog';
 
-describe('lib/annotations/doc/CreateHighlightDialog', () => {
+describe('doc/CreateHighlightDialog', () => {
     const sandbox = sinon.sandbox.create();
     let dialog;
     let parentEl;
@@ -21,11 +21,11 @@ describe('lib/annotations/doc/CreateHighlightDialog', () => {
     };
 
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/CreateHighlightDialog-test.html');
+        fixture.load('doc/__tests__/CreateHighlightDialog-test.html');
 
         const parentEl = document.querySelector('.bp-create-highlight-dialog-container');
         dialog = new CreateHighlightDialog(parentEl, { localized });
diff --git a/src/doc/__tests__/DocAnnotator-test.js b/src/doc/__tests__/DocAnnotator-test.js
index ef352bd7a..f0930f7e1 100644
--- a/src/doc/__tests__/DocAnnotator-test.js
+++ b/src/doc/__tests__/DocAnnotator-test.js
@@ -24,13 +24,13 @@ const sandbox = sinon.sandbox.create();
 
 const CLASS_DEFAULT_CURSOR = 'bp-use-default-cursor';
 
-describe('lib/annotations/doc/DocAnnotator', () => {
+describe('doc/DocAnnotator', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocAnnotator-test.html');
+        fixture.load('doc/__tests__/DocAnnotator-test.html');
 
         const options = {
             annotator: {
diff --git a/src/doc/__tests__/DocDrawingDialog-test.js b/src/doc/__tests__/DocDrawingDialog-test.js
index 8e69e64d5..7e27d2bf0 100644
--- a/src/doc/__tests__/DocDrawingDialog-test.js
+++ b/src/doc/__tests__/DocDrawingDialog-test.js
@@ -6,13 +6,13 @@ let dialog;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/doc/DocDrawingDialog', () => {
+describe('doc/DocDrawingDialog', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocDrawingDialog-test.html');
+        fixture.load('doc/__tests__/DocDrawingDialog-test.html');
         dialog = new DocDrawingDialog({
             annotatedElement: document.querySelector('.annotated-element'),
             location: {},
diff --git a/src/doc/__tests__/DocDrawingThread-test.js b/src/doc/__tests__/DocDrawingThread-test.js
index 135930444..23f541874 100644
--- a/src/doc/__tests__/DocDrawingThread-test.js
+++ b/src/doc/__tests__/DocDrawingThread-test.js
@@ -13,13 +13,13 @@ let thread;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/doc/DocDrawingThread', () => {
+describe('doc/DocDrawingThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocDrawingThread-test.html');
+        fixture.load('doc/__tests__/DocDrawingThread-test.html');
         thread = new DocDrawingThread({
             annotationService: {
                 user: {
diff --git a/src/doc/__tests__/DocHighlightDialog-test.js b/src/doc/__tests__/DocHighlightDialog-test.js
index 992120f08..010767bfb 100644
--- a/src/doc/__tests__/DocHighlightDialog-test.js
+++ b/src/doc/__tests__/DocHighlightDialog-test.js
@@ -18,13 +18,13 @@ const DATA_TYPE_HIGHLIGHT_BTN = 'highlight-btn';
 const DATA_TYPE_ADD_HIGHLIGHT_COMMENT = 'add-highlight-comment-btn';
 const PAGE_PADDING_TOP = 15;
 
-describe('lib/annotations/doc/DocHighlightDialog', () => {
+describe('doc/DocHighlightDialog', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocHighlightDialog-test.html');
+        fixture.load('doc/__tests__/DocHighlightDialog-test.html');
 
         dialog = new DocHighlightDialog({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/doc/__tests__/DocHighlightThread-test.js b/src/doc/__tests__/DocHighlightThread-test.js
index a96043f20..5c0cbe4a0 100644
--- a/src/doc/__tests__/DocHighlightThread-test.js
+++ b/src/doc/__tests__/DocHighlightThread-test.js
@@ -15,13 +15,13 @@ import {
 let thread;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/doc/DocHighlightThread', () => {
+describe('doc/DocHighlightThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocHighlightThread-test.html');
+        fixture.load('doc/__tests__/DocHighlightThread-test.html');
 
         thread = new DocHighlightThread({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/doc/__tests__/DocPointDialog-test.js b/src/doc/__tests__/DocPointDialog-test.js
index be399b8f9..57d64b589 100644
--- a/src/doc/__tests__/DocPointDialog-test.js
+++ b/src/doc/__tests__/DocPointDialog-test.js
@@ -6,13 +6,13 @@ import * as docAnnotatorUtil from '../docAnnotatorUtil';
 let dialog;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/doc/DocPointDialog', () => {
+describe('doc/DocPointDialog', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocPointDialog-test.html');
+        fixture.load('doc/__tests__/DocPointDialog-test.html');
 
         dialog = new DocPointDialog({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/doc/__tests__/DocPointThread-test.js b/src/doc/__tests__/DocPointThread-test.js
index 1617ccf6a..ad3359cd6 100644
--- a/src/doc/__tests__/DocPointThread-test.js
+++ b/src/doc/__tests__/DocPointThread-test.js
@@ -9,13 +9,13 @@ import { STATES } from '../../annotationConstants';
 let pointThread;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/doc/DocPointThread', () => {
+describe('doc/DocPointThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/DocPointThread-test.html');
+        fixture.load('doc/__tests__/DocPointThread-test.html');
 
         pointThread = new DocPointThread({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/doc/__tests__/docAnnotatorUtil-test.js b/src/doc/__tests__/docAnnotatorUtil-test.js
index 0eb31946e..9cec98b36 100644
--- a/src/doc/__tests__/docAnnotatorUtil-test.js
+++ b/src/doc/__tests__/docAnnotatorUtil-test.js
@@ -11,13 +11,13 @@ import * as annotatorUtil from '../../annotatorUtil';
 const sandbox = sinon.sandbox.create();
 let stubs = {};
 
-describe('lib/annotations/doc/docAnnotatorUtil', () => {
+describe('doc/docAnnotatorUtil', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/doc/__tests__/docAnnotatorUtil-test.html');
+        fixture.load('doc/__tests__/docAnnotatorUtil-test.html');
     });
 
     afterEach(() => {
diff --git a/src/drawing/__tests__/DrawingContainer-test.js b/src/drawing/__tests__/DrawingContainer-test.js
index 50b160471..6c3dbacd6 100644
--- a/src/drawing/__tests__/DrawingContainer-test.js
+++ b/src/drawing/__tests__/DrawingContainer-test.js
@@ -3,9 +3,9 @@ import DrawingContainer from '../DrawingContainer';
 let drawingContainer;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/drawing/DrawingContainer', () => {
+describe('drawing/DrawingContainer', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
diff --git a/src/drawing/__tests__/DrawingModeController-test.js b/src/drawing/__tests__/DrawingModeController-test.js
index 95f0192a9..ccef99798 100644
--- a/src/drawing/__tests__/DrawingModeController-test.js
+++ b/src/drawing/__tests__/DrawingModeController-test.js
@@ -7,7 +7,7 @@ let drawingModeController;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/drawing/DrawingModeController', () => {
+describe('drawing/DrawingModeController', () => {
     beforeEach(() => {
         drawingModeController = new DrawingModeController();
         stubs = {};
diff --git a/src/drawing/__tests__/DrawingPath-test.js b/src/drawing/__tests__/DrawingPath-test.js
index def9d8029..5623be063 100644
--- a/src/drawing/__tests__/DrawingPath-test.js
+++ b/src/drawing/__tests__/DrawingPath-test.js
@@ -3,9 +3,9 @@ import DrawingPath from '../DrawingPath';
 let drawingPath;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/drawing/DrawingPath', () => {
+describe('drawing/DrawingPath', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
diff --git a/src/drawing/__tests__/DrawingThread-test.js b/src/drawing/__tests__/DrawingThread-test.js
index 0102f2869..223b46dd9 100644
--- a/src/drawing/__tests__/DrawingThread-test.js
+++ b/src/drawing/__tests__/DrawingThread-test.js
@@ -9,9 +9,9 @@ let thread;
 let stubs;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/drawing/DrawingThread', () => {
+describe('drawing/DrawingThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
diff --git a/src/image/__tests__/ImageAnnotator-test.js b/src/image/__tests__/ImageAnnotator-test.js
index fb8bea354..0519680e4 100644
--- a/src/image/__tests__/ImageAnnotator-test.js
+++ b/src/image/__tests__/ImageAnnotator-test.js
@@ -8,13 +8,13 @@ import { SELECTOR_ANNOTATION_POINT_BUTTON } from '../../annotationConstants';
 let annotator;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/image/ImageAnnotator', () => {
+describe('image/ImageAnnotator', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/image/__tests__/ImageAnnotator-test.html');
+        fixture.load('image/__tests__/ImageAnnotator-test.html');
 
         const options = {
             annotator: {
diff --git a/src/image/__tests__/ImagePointDialog-test.js b/src/image/__tests__/ImagePointDialog-test.js
index 61aa99704..4de90d166 100644
--- a/src/image/__tests__/ImagePointDialog-test.js
+++ b/src/image/__tests__/ImagePointDialog-test.js
@@ -6,13 +6,13 @@ import * as imageAnnotatorUtil from '../imageAnnotatorUtil';
 let dialog;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/image/ImagePointDialog', () => {
+describe('image/ImagePointDialog', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/image/__tests__/ImagePointDialog-test.html');
+        fixture.load('image/__tests__/ImagePointDialog-test.html');
 
         dialog = new ImagePointDialog({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/image/__tests__/ImagePointThread-test.js b/src/image/__tests__/ImagePointThread-test.js
index f714ff8f9..ede1a0fae 100644
--- a/src/image/__tests__/ImagePointThread-test.js
+++ b/src/image/__tests__/ImagePointThread-test.js
@@ -8,13 +8,13 @@ import * as imageAnnotatorUtil from '../imageAnnotatorUtil';
 let thread;
 const sandbox = sinon.sandbox.create();
 
-describe('lib/annotations/image/ImagePointThread', () => {
+describe('image/ImagePointThread', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/image/__tests__/ImagePointThread-test.html');
+        fixture.load('image/__tests__/ImagePointThread-test.html');
 
         thread = new ImagePointThread({
             annotatedElement: document.querySelector('.annotated-element'),
diff --git a/src/image/__tests__/imageAnnotatorUtil-test.js b/src/image/__tests__/imageAnnotatorUtil-test.js
index 877952b7b..ff0b1011e 100644
--- a/src/image/__tests__/imageAnnotatorUtil-test.js
+++ b/src/image/__tests__/imageAnnotatorUtil-test.js
@@ -9,13 +9,13 @@ const ROTATION_ONCE_DEG = -90;
 const ROTATION_TWICE_DEG = -180;
 const ROTATION_THRICE_DEG = -270;
 
-describe('lib/annotations/image/imageAnnotatorUtil', () => {
+describe('image/imageAnnotatorUtil', () => {
     before(() => {
-        fixture.setBase('src/lib');
+        fixture.setBase('src');
     });
 
     beforeEach(() => {
-        fixture.load('annotations/image/__tests__/imageAnnotatorUtil-test.html');
+        fixture.load('image/__tests__/imageAnnotatorUtil-test.html');
     });
 
     afterEach(() => {