diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
index b60f05a0ef8..5bd3f7fe529 100644
--- a/src/traces/bar/calc.js
+++ b/src/traces/bar/calc.js
@@ -11,7 +11,7 @@
 
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
+var Axes = require('../../plots/cartesian/axes');
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var colorscaleCalc = require('../../components/colorscale/calc');
 
@@ -22,8 +22,8 @@ module.exports = function calc(gd, trace) {
     // note: this logic for choosing orientation is
     // duplicated in graph_obj->setstyles
 
-    var xa = Plotly.Axes.getFromId(gd, trace.xaxis||'x'),
-        ya = Plotly.Axes.getFromId(gd, trace.yaxis||'y'),
+    var xa = Axes.getFromId(gd, trace.xaxis||'x'),
+        ya = Axes.getFromId(gd, trace.yaxis||'y'),
         orientation = trace.orientation || ((trace.x && !trace.y) ? 'h' : 'v'),
         pos, size, i;
 
diff --git a/src/traces/bar/hover.js b/src/traces/bar/hover.js
index bb3b46c0bae..5d431d8e5b6 100644
--- a/src/traces/bar/hover.js
+++ b/src/traces/bar/hover.js
@@ -9,7 +9,8 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Fx = require('../../plots/cartesian/graph_interact');
+var ErrorBars = require('../../components/errorbars');
 var Color = require('../../components/color');
 
 
@@ -32,25 +33,25 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
         dx = function(di){
             // add a gradient so hovering near the end of a
             // bar makes it a little closer match
-            return Plotly.Fx.inbox(di.b-xval, di.x-xval) + (di.x-xval)/(di.x-di.b);
+            return Fx.inbox(di.b-xval, di.x-xval) + (di.x-xval)/(di.x-di.b);
         };
         dy = function(di){
             var centerPos = barPos(di) - yval;
-            return Plotly.Fx.inbox(centerPos - barDelta, centerPos + barDelta);
+            return Fx.inbox(centerPos - barDelta, centerPos + barDelta);
         };
     }
     else {
         dy = function(di){
-            return Plotly.Fx.inbox(di.b-yval, di.y-yval) + (di.y-yval)/(di.y-di.b);
+            return Fx.inbox(di.b-yval, di.y-yval) + (di.y-yval)/(di.y-di.b);
         };
         dx = function(di){
             var centerPos = barPos(di) - xval;
-            return Plotly.Fx.inbox(centerPos - barDelta, centerPos + barDelta);
+            return Fx.inbox(centerPos - barDelta, centerPos + barDelta);
         };
     }
 
-    var distfn = Plotly.Fx.getDistanceFunction(hovermode, dx, dy);
-    Plotly.Fx.getClosest(cd, distfn, pointData);
+    var distfn = Fx.getDistanceFunction(hovermode, dx, dy);
+    Fx.getClosest(cd, distfn, pointData);
 
     // skip the rest (for this trace) if we didn't find a close point
     if(pointData.index===false) return;
@@ -82,7 +83,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
     if(di.tx) pointData.text = di.tx;
 
-    Plotly.ErrorBars.hoverInfo(di, trace, pointData);
+    ErrorBars.hoverInfo(di, trace, pointData);
 
     return [pointData];
 };
diff --git a/src/traces/bar/layout_defaults.js b/src/traces/bar/layout_defaults.js
index e4ac480334e..e26b5d2ffd1 100644
--- a/src/traces/bar/layout_defaults.js
+++ b/src/traces/bar/layout_defaults.js
@@ -9,7 +9,8 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
 var Lib = require('../../lib');
 
 var layoutAttributes = require('./layout_attributes');
@@ -23,36 +24,33 @@ module.exports = function(layoutIn, layoutOut, fullData) {
     var hasBars = false,
         shouldBeGapless = false,
         gappedAnyway = false,
-        usedSubplots = {},
-        i,
-        trace,
-        subploti;
-
-    for(i = 0; i < fullData.length; i++) {
-        trace = fullData[i];
-        if(Plotly.Plots.traceIs(trace, 'bar')) hasBars = true;
+        usedSubplots = {};
+
+    for(var i = 0; i < fullData.length; i++) {
+        var trace = fullData[i];
+        if(Plots.traceIs(trace, 'bar')) hasBars = true;
         else continue;
 
         // if we have at least 2 grouped bar traces on the same subplot,
         // we should default to a gap anyway, even if the data is histograms
         if(layoutIn.barmode !== 'overlay' && layoutIn.barmode !== 'stack') {
-            subploti = trace.xaxis + trace.yaxis;
+            var subploti = trace.xaxis + trace.yaxis;
             if(usedSubplots[subploti]) gappedAnyway = true;
             usedSubplots[subploti] = true;
         }
 
-        if(trace.visible && trace.type==='histogram') {
-            var pa = Plotly.Axes.getFromId({_fullLayout:layoutOut},
-                        trace[trace.orientation==='v' ? 'xaxis' : 'yaxis']);
-            if(pa.type!=='category') shouldBeGapless = true;
+        if(trace.visible && trace.type === 'histogram') {
+            var pa = Axes.getFromId({_fullLayout: layoutOut},
+                        trace[trace.orientation === 'v' ? 'xaxis' : 'yaxis']);
+            if(pa.type !== 'category') shouldBeGapless = true;
         }
     }
 
     if(!hasBars) return;
 
     var mode = coerce('barmode');
-    if(mode!=='overlay') coerce('barnorm');
+    if(mode !== 'overlay') coerce('barnorm');
 
-    coerce('bargap', shouldBeGapless && !gappedAnyway ? 0 : 0.2);
+    coerce('bargap', (shouldBeGapless && !gappedAnyway) ? 0 : 0.2);
     coerce('bargroupgap');
 };
diff --git a/src/traces/bar/set_positions.js b/src/traces/bar/set_positions.js
index a8f3d05dc27..9da1a3a2736 100644
--- a/src/traces/bar/set_positions.js
+++ b/src/traces/bar/set_positions.js
@@ -11,7 +11,8 @@
 
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
 var Lib = require('../../lib');
 
 /*
@@ -27,22 +28,23 @@ module.exports = function setPositions(gd, plotinfo) {
         ya = plotinfo.y(),
         i, j;
 
-    ['v','h'].forEach(function(dir){
+    ['v', 'h'].forEach(function(dir){
         var bl = [],
-            pLetter = {v:'x',h:'y'}[dir],
-            sLetter = {v:'y',h:'x'}[dir],
+            pLetter = {v:'x', h:'y'}[dir],
+            sLetter = {v:'y', h:'x'}[dir],
             pa = plotinfo[pLetter](),
             sa = plotinfo[sLetter]();
 
         gd._fullData.forEach(function(trace,i) {
             if(trace.visible === true &&
-                    Plotly.Plots.traceIs(trace, 'bar') &&
+                    Plots.traceIs(trace, 'bar') &&
                     trace.orientation === dir &&
                     trace.xaxis === xa._id &&
                     trace.yaxis === ya._id) {
                 bl.push(i);
             }
         });
+
         if(!bl.length) return;
 
         // bar position offset and width calculation
@@ -53,9 +55,9 @@ module.exports = function setPositions(gd, plotinfo) {
         function barposition(bl1) {
             // find the min. difference between any points
             // in any traces in bl1
-            var pvals=[];
+            var pvals = [];
             bl1.forEach(function(i){
-                gd.calcdata[i].forEach(function(v){ pvals.push(v.p); });
+                gd.calcdata[i].forEach(function(v) { pvals.push(v.p); });
             });
             var dv = Lib.distinctVals(pvals),
                 pv2 = dv.vals,
@@ -65,7 +67,8 @@ module.exports = function setPositions(gd, plotinfo) {
             // if so, let them have full width even if mode is group
             var overlap = false,
                 comparelist = [];
-            if(fullLayout.barmode==='group') {
+
+            if(fullLayout.barmode === 'group') {
                 bl1.forEach(function(i) {
                     if(overlap) return;
                     gd.calcdata[i].forEach(function(v) {
@@ -82,36 +85,37 @@ module.exports = function setPositions(gd, plotinfo) {
             }
 
             // check forced minimum dtick
-            Plotly.Axes.minDtick(pa, barDiff, pv2[0], overlap);
+            Axes.minDtick(pa, barDiff, pv2[0], overlap);
 
             // position axis autorange - always tight fitting
-            Plotly.Axes.expand(pa, pv2, {vpad: barDiff/2});
+            Axes.expand(pa, pv2, {vpad: barDiff / 2});
 
             // bar widths and position offsets
-            barDiff *= 1-fullLayout.bargap;
-            if(overlap) barDiff/=bl.length;
+            barDiff *= 1 - fullLayout.bargap;
+            if(overlap) barDiff /= bl.length;
 
             var barCenter;
             function setBarCenter(v) { v[pLetter] = v.p + barCenter; }
 
-            for(var i=0; i<bl1.length; i++){
+            for(var i = 0; i < bl1.length; i++){
                 var t = gd.calcdata[bl1[i]][0].t;
-                t.barwidth = barDiff*(1-fullLayout.bargroupgap);
-                t.poffset = ((overlap ? (2*i+1-bl1.length)*barDiff : 0) -
-                    t.barwidth)/2;
+                t.barwidth = barDiff * (1 - fullLayout.bargroupgap);
+                t.poffset = ((overlap ? (2 * i + 1 - bl1.length) * barDiff : 0) -
+                    t.barwidth) / 2;
                 t.dbar = dv.minDiff;
 
                 // store the bar center in each calcdata item
-                barCenter = t.poffset + t.barwidth/2;
+                barCenter = t.poffset + t.barwidth / 2;
                 gd.calcdata[bl1[i]].forEach(setBarCenter);
             }
         }
-        if(fullLayout.barmode==='overlay') {
+
+        if(fullLayout.barmode === 'overlay') {
             bl.forEach(function(bli){ barposition([bli]); });
         }
         else barposition(bl);
 
-        var stack = fullLayout.barmode==='stack',
+        var stack = (fullLayout.barmode === 'stack'),
             norm = fullLayout.barnorm;
 
         // bar size range and stacking calculation
@@ -127,20 +131,20 @@ module.exports = function setPositions(gd, plotinfo) {
 
                 // make sure if p is different only by rounding,
                 // we still stack
-                sumround = gd.calcdata[bl[0]][0].t.barwidth/100,
+                sumround = gd.calcdata[bl[0]][0].t.barwidth / 100,
                 sv = 0,
                 padded = true,
                 barEnd,
                 ti,
                 scale;
 
-            for(i=0; i<bl.length; i++){ // trace index
+            for(i = 0; i < bl.length; i++){ // trace index
                 ti = gd.calcdata[bl[i]];
-                for(j=0; j<ti.length; j++) {
-                    sv = Math.round(ti[j].p/sumround);
-                    var previousSum = sums[sv]||0;
+                for(j = 0; j < ti.length; j++) {
+                    sv = Math.round(ti[j].p / sumround);
+                    var previousSum = sums[sv] || 0;
                     if(stack) ti[j].b = previousSum;
-                    barEnd = ti[j].b+ti[j].s;
+                    barEnd = ti[j].b + ti[j].s;
                     sums[sv] = previousSum + ti[j].s;
 
                     // store the bar top in each calcdata item
@@ -160,9 +164,9 @@ module.exports = function setPositions(gd, plotinfo) {
                     tiny = top/1e9; // in case of rounding error in sum
                 sMin = 0;
                 sMax = stack ? top : 0;
-                for(i=0; i<bl.length; i++){ // trace index
+                for(i = 0; i < bl.length; i++){ // trace index
                     ti = gd.calcdata[bl[i]];
-                    for(j=0; j<ti.length; j++) {
+                    for(j = 0; j < ti.length; j++) {
                         scale = top / sums[Math.round(ti[j].p/sumround)];
                         ti[j].b *= scale;
                         ti[j].s *= scale;
@@ -183,16 +187,16 @@ module.exports = function setPositions(gd, plotinfo) {
                 }
             }
 
-            Plotly.Axes.expand(sa, [sMin, sMax], {tozero: true, padded: padded});
+            Axes.expand(sa, [sMin, sMax], {tozero: true, padded: padded});
         }
         else {
             // for grouped or overlaid bars, just make sure zero is
             // included, along with the tops of each bar, and store
             // these bar tops in calcdata
-            var fs = function(v){ v[sLetter] = v.s; return v.s; };
+            var fs = function(v) { v[sLetter] = v.s; return v.s; };
 
-            for(i=0; i<bl.length; i++){
-                Plotly.Axes.expand(sa, gd.calcdata[bl[i]].map(fs),
+            for(i = 0; i < bl.length; i++){
+                Axes.expand(sa, gd.calcdata[bl[i]].map(fs),
                     {tozero: true, padded: true});
             }
         }
diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
index aae5968df9f..5e05697880c 100644
--- a/src/traces/bar/style.js
+++ b/src/traces/bar/style.js
@@ -11,8 +11,8 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
 var Color = require('../../components/color');
+var Drawing = require('../../components/drawing');
 
 
 module.exports = function style(gd) {
@@ -21,7 +21,7 @@ module.exports = function style(gd) {
         fullLayout = gd._fullLayout;
 
     // trace styling
-    s.style('opacity',function(d){ return d[0].trace.opacity; })
+    s.style('opacity', function(d) { return d[0].trace.opacity; })
 
     // for gapless (either stacked or neighboring grouped) bars use
     // crispEdges to turn off antialiasing so an artificial gap
@@ -41,8 +41,8 @@ module.exports = function style(gd) {
             marker = trace.marker,
             markerLine = marker.line,
             markerIn = (trace._input||{}).marker||{},
-            markerScale = Plotly.Drawing.tryColorscale(marker, markerIn, ''),
-            lineScale = Plotly.Drawing.tryColorscale(marker, markerIn, 'line.');
+            markerScale = Drawing.tryColorscale(marker, markerIn, ''),
+            lineScale = Drawing.tryColorscale(marker, markerIn, 'line.');
 
         d3.select(this).selectAll('path').each(function(d) {
             // allow all marker and marker line colors to be scaled
diff --git a/src/traces/box/calc.js b/src/traces/box/calc.js
index 2548dc42415..69df8d435ae 100644
--- a/src/traces/box/calc.js
+++ b/src/traces/box/calc.js
@@ -10,13 +10,14 @@
 
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Axes = require('../../plots/cartesian/axes');
 
+
+// outlier definition based on http://www.physics.csbsju.edu/stats/box2.html
 module.exports = function calc(gd, trace) {
-    // outlier definition based on http://www.physics.csbsju.edu/stats/box2.html
-    var xa = Plotly.Axes.getFromId(gd, trace.xaxis||'x'),
-        ya = Plotly.Axes.getFromId(gd, trace.yaxis||'y'),
+    var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
+        ya = Axes.getFromId(gd, trace.yaxis || 'y'),
         orientation = trace.orientation,
         cd = [],
         valAxis, valLetter, val, valBinned,
@@ -39,7 +40,7 @@ module.exports = function calc(gd, trace) {
 
     // size autorange based on all source points
     // position happens afterward when we know all the pos
-    Plotly.Axes.expand(valAxis, val, {padded: true});
+    Axes.expand(valAxis, val, {padded: true});
 
     // In vertical (horizontal) box plots:
     // if no x (y) data, use x0 (y0), or name
diff --git a/src/traces/box/hover.js b/src/traces/box/hover.js
index 9d3651e5bcb..b22dd70c2f4 100644
--- a/src/traces/box/hover.js
+++ b/src/traces/box/hover.js
@@ -8,7 +8,9 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Axes = require('../../plots/cartesian/axes');
+var Fx = require('../../plots/cartesian/graph_interact');
+var Lib = require('../../lib');
 var Color = require('../../components/color');
 
 module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
@@ -28,11 +30,11 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
     if (trace.orientation==='h') {
         dx = function(di){
-            return Plotly.Fx.inbox(di.min - xval, di.max - xval);
+            return Fx.inbox(di.min - xval, di.max - xval);
         };
         dy = function(di){
             var pos = di.pos + t.bPos - yval;
-            return Plotly.Fx.inbox(pos - boxDelta, pos + boxDelta);
+            return Fx.inbox(pos - boxDelta, pos + boxDelta);
         };
         posLetter = 'y';
         posAxis = ya;
@@ -41,10 +43,10 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     } else {
         dx = function(di){
             var pos = di.pos + t.bPos - xval;
-            return Plotly.Fx.inbox(pos - boxDelta, pos + boxDelta);
+            return Fx.inbox(pos - boxDelta, pos + boxDelta);
         };
         dy = function(di){
-            return Plotly.Fx.inbox(di.min - yval, di.max - yval);
+            return Fx.inbox(di.min - yval, di.max - yval);
         };
         posLetter = 'x';
         posAxis = xa;
@@ -52,8 +54,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
         valAxis = ya;
     }
 
-    distfn = Plotly.Fx.getDistanceFunction(hovermode, dx, dy);
-    Plotly.Fx.getClosest(cd, distfn, pointData);
+    distfn = Fx.getDistanceFunction(hovermode, dx, dy);
+    Fx.getClosest(cd, distfn, pointData);
 
     // skip the rest (for this trace) if we didn't find a close point
     if(pointData.index===false) return;
@@ -71,7 +73,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     pointData[posLetter+'0'] = posAxis.c2p(di.pos + t.bPos - t.bdPos, true);
     pointData[posLetter+'1'] = posAxis.c2p(di.pos + t.bPos + t.bdPos, true);
 
-    Plotly.Axes.tickText(posAxis, posAxis.c2l(di.pos), 'hover').text;
+    Axes.tickText(posAxis, posAxis.c2l(di.pos), 'hover').text;
     pointData[posLetter+'LabelVal'] = di.pos;
 
     // box plots: each "point" gets many labels
@@ -90,7 +92,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
         // copy out to a new object for each value to label
         val = valAxis.c2p(di[attr], true);
-        pointData2 = Plotly.Lib.extendFlat({}, pointData);
+        pointData2 = Lib.extendFlat({}, pointData);
         pointData2[valLetter+'0'] = pointData2[valLetter+'1'] = val;
         pointData2[valLetter+'LabelVal'] = di[attr];
         pointData2.attr = attr;
diff --git a/src/traces/box/plot.js b/src/traces/box/plot.js
index ab64cc56867..381b27c628d 100644
--- a/src/traces/box/plot.js
+++ b/src/traces/box/plot.js
@@ -10,8 +10,8 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Drawing = require('../../components/drawing');
 
 
 // repeatable pseudorandom generator
@@ -191,7 +191,7 @@ module.exports = function plot(gd, plotinfo, cdbox) {
                     });
                 })
                 .enter().append('path')
-                .call(Plotly.Drawing.translatePoints, xa, ya);
+                .call(Drawing.translatePoints, xa, ya);
         }
         // draw mean (and stdev diamond) if desired
         if(trace.boxmean) {
diff --git a/src/traces/box/set_positions.js b/src/traces/box/set_positions.js
index 6f0e1cd487b..c90a990524e 100644
--- a/src/traces/box/set_positions.js
+++ b/src/traces/box/set_positions.js
@@ -8,18 +8,19 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
 var Lib = require('../../lib');
 
+
 module.exports = function setPositions(gd, plotinfo) {
     var fullLayout = gd._fullLayout,
         xa = plotinfo.x(),
         ya = plotinfo.y(),
-        orientations = ['v', 'h'],
-        posAxis, i, j, k;
+        orientations = ['v', 'h'];
+    var posAxis, i, j, k;
 
-    for (i=0; i < orientations.length; ++i) {
+    for(i = 0; i < orientations.length; ++i) {
         var orientation = orientations[i],
             boxlist = [],
             boxpointlist = [],
@@ -70,7 +71,7 @@ module.exports = function setPositions(gd, plotinfo) {
         if(boxpointlist.length===boxdv.vals.length) gd.numboxes = 1;
 
         // check for forced minimum dtick
-        Plotly.Axes.minDtick(posAxis, boxdv.minDiff, boxdv.vals[0], true);
+        Axes.minDtick(posAxis, boxdv.minDiff, boxdv.vals[0], true);
 
         // set the width of all boxes
         for (i=0; i < boxlist.length; ++i) {
@@ -82,7 +83,7 @@ module.exports = function setPositions(gd, plotinfo) {
         // their points as far out as the other boxes
         var padfactor = (1-fullLayout.boxgap) * (1-fullLayout.boxgroupgap) *
                 dPos / gd.numboxes;
-        Plotly.Axes.expand(posAxis, boxdv.vals, {
+        Axes.expand(posAxis, boxdv.vals, {
             vpadminus: dPos+minPad*padfactor,
             vpadplus: dPos+maxPad*padfactor
         });
diff --git a/src/traces/box/style.js b/src/traces/box/style.js
index bb1800aaf07..09eba91fcab 100644
--- a/src/traces/box/style.js
+++ b/src/traces/box/style.js
@@ -10,18 +10,19 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
 var Color = require('../../components/color');
+var Drawing = require('../../components/drawing');
+
 
 module.exports = function style(gd) {
     var s = d3.select(gd).selectAll('g.trace.boxes');
 
-    s.style('opacity', function(d){ return d[0].trace.opacity; })
+    s.style('opacity', function(d) { return d[0].trace.opacity; })
         .each(function(d){
             var trace = d[0].trace,
                 lineWidth = trace.line.width;
             d3.select(this).selectAll('path.box')
-                .style('stroke-width',lineWidth+'px')
+                .style('stroke-width', lineWidth+'px')
                 .call(Color.stroke, trace.line.color)
                 .call(Color.fill, trace.fillcolor);
             d3.select(this).selectAll('path.mean')
@@ -31,6 +32,6 @@ module.exports = function style(gd) {
                 })
                 .call(Color.stroke, trace.line.color);
             d3.select(this).selectAll('g.points path')
-                .call(Plotly.Drawing.pointStyle, trace);
+                .call(Drawing.pointStyle, trace);
         });
 };
diff --git a/src/traces/choropleth/plot.js b/src/traces/choropleth/plot.js
index 5f5573485d1..771b090daba 100644
--- a/src/traces/choropleth/plot.js
+++ b/src/traces/choropleth/plot.js
@@ -9,9 +9,10 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var d3 = require('d3');
 
+var Axes = require('../../plots/cartesian/axes');
+var Fx = require('../../plots/cartesian/graph_interact');
 var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 
@@ -88,7 +89,7 @@ plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
                 var xy = geo.projection(pt.properties.ct);
                 cleanHoverLabelsFunc(pt);
 
-                Plotly.Fx.loneHover({
+                Fx.loneHover({
                     x: xy[0],
                     y: xy[1],
                     name: pt.nameLabel,
@@ -112,11 +113,11 @@ plotChoropleth.plot = function(geo, choroplethData, geoLayout) {
                     .on('mouseover', handleMouseOver)
                     .on('click', handleClick)
                     .on('mouseout', function() {
-                        Plotly.Fx.loneUnhover(geo.hoverContainer);
+                        Fx.loneUnhover(geo.hoverContainer);
                     })
                     .on('mousedown', function() {
                         // to simulate the 'zoomon' event
-                        Plotly.Fx.loneUnhover(geo.hoverContainer);
+                        Fx.loneUnhover(geo.hoverContainer);
                     })
                     .on('mouseup', handleMouseOver);  // ~ 'zoomend'
         });
@@ -177,7 +178,7 @@ function makeCleanHoverLabelsFunc(geo, trace) {
 
     function formatter(val) {
         var axis = geo.mockAxis;
-        return Plotly.Axes.tickText(axis, axis.c2l(val), 'hover').text;
+        return Axes.tickText(axis, axis.c2l(val), 'hover').text;
     }
 
     return function cleanHoverLabelsFunc(pt) {
diff --git a/src/traces/contour/calc.js b/src/traces/contour/calc.js
index 39cf923ab27..a432e17456c 100644
--- a/src/traces/contour/calc.js
+++ b/src/traces/contour/calc.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Axes = require('../../plots/cartesian/axes');
 var heatmapCalc = require('../heatmap/calc');
 
 
@@ -26,15 +26,15 @@ module.exports = function calc(gd, trace) {
             type: 'linear',
             range: [trace.zmin, trace.zmax]
         };
-        Plotly.Axes.autoTicks(dummyAx,
+        Axes.autoTicks(dummyAx,
             (trace.zmax - trace.zmin) / (trace.ncontours||15));
-        contours.start = Plotly.Axes.tickFirst(dummyAx);
+        contours.start = Axes.tickFirst(dummyAx);
         contours.size = dummyAx.dtick;
         dummyAx.range.reverse();
-        contours.end = Plotly.Axes.tickFirst(dummyAx);
+        contours.end = Axes.tickFirst(dummyAx);
 
-        if(contours.start===trace.zmin) contours.start += contours.size;
-        if(contours.end===trace.zmax) contours.end -= contours.size;
+        if(contours.start === trace.zmin) contours.start += contours.size;
+        if(contours.end === trace.zmax) contours.end -= contours.size;
 
         // so rounding errors don't cause us to miss the last contour
         contours.end += contours.size/100;
diff --git a/src/traces/contour/colorbar.js b/src/traces/contour/colorbar.js
index 663bcb2628e..e51137488a5 100644
--- a/src/traces/contour/colorbar.js
+++ b/src/traces/contour/colorbar.js
@@ -11,7 +11,7 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 var getColorscale = require('../../components/colorscale/get_scale');
 var drawColorbar = require('../../components/colorbar/draw');
 
@@ -22,8 +22,8 @@ module.exports = function colorbar(gd, cd) {
 
     gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
 
-    if(trace.showscale===false){
-        Plotly.Plots.autoMargin(gd, cbId);
+    if(trace.showscale === false){
+        Plots.autoMargin(gd, cbId);
         return;
     }
 
diff --git a/src/traces/contour/plot.js b/src/traces/contour/plot.js
index f9f0ccafb4f..f6cd7acb979 100644
--- a/src/traces/contour/plot.js
+++ b/src/traces/contour/plot.js
@@ -11,8 +11,8 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Drawing = require('../../components/drawing');
 
 var heatmapPlot = require('../heatmap/plot');
 
@@ -104,7 +104,7 @@ function plotOne(gd, plotinfo, cd) {
     makeLines(plotGroup, pathinfo, contours);
     clipGaps(plotGroup, plotinfo, cd[0], perimeter);
 
-    Plotly.Lib.markTime('done Contour.plot');
+    Lib.markTime('done Contour.plot');
 }
 
 function emptyPathinfo(contours, plotinfo, cd0) {
@@ -539,7 +539,7 @@ function joinAllPaths(pi, perimeter) {
     function isright(pt) { return Math.abs(pt[0] - perimeter[2][0]) < 0.01; }
 
     while(startsleft.length) {
-        addpath = Plotly.Drawing.smoothopen(pi.edgepaths[i], pi.smoothing);
+        addpath = Drawing.smoothopen(pi.edgepaths[i], pi.smoothing);
         fullpath += newloop ? addpath : addpath.replace(/^M/, 'L');
         startsleft.splice(startsleft.indexOf(i), 1);
         endpt = pi.edgepaths[i][pi.edgepaths[i].length-1];
@@ -604,7 +604,7 @@ function joinAllPaths(pi, perimeter) {
 
     // finally add the interior paths
     for(i = 0; i < pi.paths.length; i++) {
-        fullpath += Plotly.Drawing.smoothclosed(pi.paths[i], pi.smoothing);
+        fullpath += Drawing.smoothclosed(pi.paths[i], pi.smoothing);
     }
 
     return fullpath;
@@ -626,7 +626,7 @@ function makeLines(plotgroup, pathinfo, contours) {
     opencontourlines.exit().remove();
     opencontourlines
         .attr('d', function(d){
-            return Plotly.Drawing.smoothopen(d, smoothing);
+            return Drawing.smoothopen(d, smoothing);
         })
         .style('stroke-miterlimit',1);
 
@@ -637,7 +637,7 @@ function makeLines(plotgroup, pathinfo, contours) {
     closedcontourlines.exit().remove();
     closedcontourlines
         .attr('d', function(d){
-            return Plotly.Drawing.smoothclosed(d, smoothing);
+            return Drawing.smoothclosed(d, smoothing);
         })
         .style('stroke-miterlimit',1);
 }
@@ -685,9 +685,9 @@ function clipGaps(plotGroup, plotinfo, cd0, perimeter) {
     }
     else clipId = null;
 
-    plotGroup.call(Plotly.Drawing.setClipUrl, clipId);
+    plotGroup.call(Drawing.setClipUrl, clipId);
     plotinfo.plot.selectAll('.hm' + cd0.trace.uid)
-        .call(Plotly.Drawing.setClipUrl, clipId);
+        .call(Drawing.setClipUrl, clipId);
 }
 
 function makeClipMask(cd0) {
diff --git a/src/traces/contour/style.js b/src/traces/contour/style.js
index a09c82f974e..e48ed71973d 100644
--- a/src/traces/contour/style.js
+++ b/src/traces/contour/style.js
@@ -11,14 +11,14 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
+var Drawing = require('../../components/drawing');
 var getColorscale = require('../../components/colorscale/get_scale');
 var heatmapStyle = require('../heatmap/style');
 
 
 module.exports = function style(gd) {
     d3.select(gd).selectAll('g.contour')
-        .style('opacity',function(d){ return d.trace.opacity; })
+        .style('opacity', function(d) { return d.trace.opacity; })
         .each(function(d) {
             var c = d3.select(this),
                 trace = d.trace,
@@ -39,7 +39,7 @@ module.exports = function style(gd) {
 
             c.selectAll('g.contourlevel').each(function(d, i) {
                 d3.select(this).selectAll('path')
-                    .call(Plotly.Drawing.lineGroupStyle,
+                    .call(Drawing.lineGroupStyle,
                         line.width,
                         colorLines ? colormap(contours.start+i*cs) : line.color,
                         line.dash);
diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
index 8fe58f0fd3d..680c785320c 100644
--- a/src/traces/heatmap/calc.js
+++ b/src/traces/heatmap/calc.js
@@ -11,8 +11,9 @@
 
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Axes = require('../../plots/cartesian/axes');
+var Plots = require('../../plots/plots');
 
 var histogram2dCalc = require('../histogram2d/calc');
 var colorscaleCalc = require('../../components/colorscale/calc');
@@ -26,10 +27,10 @@ module.exports = function calc(gd, trace) {
 
     // prepare the raw data
     // run makeCalcdata on x and y even for heatmaps, in case of category mappings
-    var xa = Plotly.Axes.getFromId(gd, trace.xaxis||'x'),
-        ya = Plotly.Axes.getFromId(gd, trace.yaxis||'y'),
-        isContour = Plotly.Plots.traceIs(trace, 'contour'),
-        isHist = Plotly.Plots.traceIs(trace, 'histogram'),
+    var xa = Axes.getFromId(gd, trace.xaxis||'x'),
+        ya = Axes.getFromId(gd, trace.yaxis||'y'),
+        isContour = Plots.traceIs(trace, 'contour'),
+        isHist = Plots.traceIs(trace, 'histogram'),
         zsmooth = isContour ? 'best' : trace.zsmooth,
         x,
         x0,
@@ -115,8 +116,8 @@ module.exports = function calc(gd, trace) {
         yIn = trace.ytype==='scaled' ? '' : trace.y,
         yArray = makeBoundArray(trace, yIn, y0, dy, z.length, ya);
 
-    Plotly.Axes.expand(xa, xArray);
-    Plotly.Axes.expand(ya, yArray);
+    Axes.expand(xa, xArray);
+    Axes.expand(ya, yArray);
 
     var cd0 = {x: xArray, y: yArray, z: z};
 
@@ -169,8 +170,8 @@ function cleanZ(trace) {
 
 function makeBoundArray(trace, arrayIn, v0In, dvIn, numbricks, ax) {
     var arrayOut = [],
-        isContour = Plotly.Plots.traceIs(trace, 'contour'),
-        isHist = Plotly.Plots.traceIs(trace, 'histogram'),
+        isContour = Plots.traceIs(trace, 'contour'),
+        isHist = Plots.traceIs(trace, 'histogram'),
         v0,
         dv,
         i;
diff --git a/src/traces/heatmap/colorbar.js b/src/traces/heatmap/colorbar.js
index 731330cfb1e..e79775acf36 100644
--- a/src/traces/heatmap/colorbar.js
+++ b/src/traces/heatmap/colorbar.js
@@ -12,8 +12,8 @@
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Plots = require('../../plots/plots');
 var getColorscale = require('../../components/colorscale/get_scale');
 var drawColorbar = require('../../components/colorbar/draw');
 
@@ -31,7 +31,7 @@ module.exports = function colorbar(gd, cd) {
     gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
 
     if(!trace.showscale){
-        Plotly.Plots.autoMargin(gd, cbId);
+        Plots.autoMargin(gd, cbId);
         return;
     }
 
diff --git a/src/traces/heatmap/hover.js b/src/traces/heatmap/hover.js
index 5999b0f58f7..e0d244853e4 100644
--- a/src/traces/heatmap/hover.js
+++ b/src/traces/heatmap/hover.js
@@ -9,13 +9,13 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Fx = require('../../plots/cartesian/graph_interact');
 var Lib = require('../../lib');
 
 
 module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour) {
     // never let a heatmap override another type as closest point
-    if(pointData.distance < Plotly.Fx.MAXDIST) return;
+    if(pointData.distance < Fx.MAXDIST) return;
 
     var cd0 = pointData.cd[0],
         trace = cd0.trace,
@@ -46,8 +46,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
             return;
         }
     }
-    else if(Plotly.Fx.inbox(xval-x[0], xval-x[x.length-1])>Plotly.Fx.MAXDIST ||
-            Plotly.Fx.inbox(yval-y[0], yval-y[y.length-1])>Plotly.Fx.MAXDIST) {
+    else if(Fx.inbox(xval-x[0], xval-x[x.length-1]) > Fx.MAXDIST ||
+            Fx.inbox(yval-y[0], yval-y[y.length-1]) > Fx.MAXDIST) {
         return;
     }
     else {
@@ -99,7 +99,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, contour)
     return [Lib.extendFlat(pointData, {
         index: [ny, nx],
         // never let a 2D override 1D type as closest point
-        distance: Plotly.Fx.MAXDIST+10,
+        distance: Fx.MAXDIST + 10,
         x0: x0,
         x1: x1,
         y0: y0,
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
index 236fad50b74..7464185433e 100644
--- a/src/traces/heatmap/plot.js
+++ b/src/traces/heatmap/plot.js
@@ -12,8 +12,8 @@
 var d3 = require('d3');
 var tinycolor = require('tinycolor2');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Plots = require('../../plots/plots');
 var getColorscale = require('../../components/colorscale/get_scale');
 var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 
@@ -52,7 +52,7 @@ function plotOne(gd, plotinfo, cd) {
         scl = getColorscale(trace.colorscale),
         x = cd[0].x,
         y = cd[0].y,
-        isContour = Plotly.Plots.traceIs(trace, 'contour'),
+        isContour = Plots.traceIs(trace, 'contour'),
         zsmooth = isContour ? 'best' : trace.zsmooth,
 
         // get z dims
diff --git a/src/traces/histogram/calc.js b/src/traces/histogram/calc.js
index 0c7e7ece7f4..ddd3e4d8a14 100644
--- a/src/traces/histogram/calc.js
+++ b/src/traces/histogram/calc.js
@@ -11,8 +11,8 @@
 
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Axes = require('../../plots/cartesian/axes');
 
 var binFunctions = require('./bin_functions');
 var normFunctions = require('./norm_functions');
@@ -28,7 +28,7 @@ module.exports = function calc(gd, trace) {
     var pos = [],
         size = [],
         i,
-        pa = Plotly.Axes.getFromId(gd,
+        pa = Axes.getFromId(gd,
             trace.orientation==='h' ? (trace.yaxis || 'y') : (trace.xaxis || 'x')),
         maindata = trace.orientation==='h' ? 'y' : 'x',
         counterdata = {x: 'y', y: 'x'}[maindata];
@@ -37,7 +37,7 @@ module.exports = function calc(gd, trace) {
     var pos0 = pa.makeCalcdata(trace, maindata);
     // calculate the bins
     if((trace['autobin' + maindata]!==false) || !(maindata + 'bins' in trace)) {
-        trace[maindata + 'bins'] = Plotly.Axes.autoBin(pos0, pa, trace['nbins' + maindata]);
+        trace[maindata + 'bins'] = Axes.autoBin(pos0, pa, trace['nbins' + maindata]);
 
         // copy bin info back to the source data.
         trace._input[maindata + 'bins'] = trace[maindata + 'bins'];
@@ -74,9 +74,9 @@ module.exports = function calc(gd, trace) {
     i = binspec.start;
     // decrease end a little in case of rounding errors
     binend = binspec.end +
-        (binspec.start - Plotly.Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
+        (binspec.start - Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
     while(i<binend && pos.length<5000) {
-        i2 = Plotly.Axes.tickIncrement(i, binspec.size);
+        i2 = Axes.tickIncrement(i, binspec.size);
         pos.push((i + i2) / 2);
         size.push(sizeinit);
         // nonuniform bins (like months) we need to search,
diff --git a/src/traces/histogram2d/calc.js b/src/traces/histogram2d/calc.js
index 10cd367f8d9..3c1a3f309a7 100644
--- a/src/traces/histogram2d/calc.js
+++ b/src/traces/histogram2d/calc.js
@@ -9,8 +9,8 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Axes = require('../../plots/cartesian/axes');
 
 var binFunctions = require('../histogram/bin_functions');
 var normFunctions = require('../histogram/norm_functions');
@@ -18,9 +18,9 @@ var doAvg = require('../histogram/average');
 
 
 module.exports = function calc(gd, trace) {
-    var xa = Plotly.Axes.getFromId(gd, trace.xaxis||'x'),
+    var xa = Axes.getFromId(gd, trace.xaxis||'x'),
         x = trace.x ? xa.makeCalcdata(trace, 'x') : [],
-        ya = Plotly.Axes.getFromId(gd, trace.yaxis||'y'),
+        ya = Axes.getFromId(gd, trace.yaxis||'y'),
         y = trace.y ? ya.makeCalcdata(trace, 'y') : [],
         x0,
         dx,
@@ -37,7 +37,7 @@ module.exports = function calc(gd, trace) {
 
     // calculate the bins
     if(trace.autobinx || !('xbins' in trace)) {
-        trace.xbins = Plotly.Axes.autoBin(x, xa, trace.nbinsx, '2d');
+        trace.xbins = Axes.autoBin(x, xa, trace.nbinsx, '2d');
         if(trace.type==='histogram2dcontour') {
             trace.xbins.start -= trace.xbins.size;
             trace.xbins.end += trace.xbins.size;
@@ -47,7 +47,7 @@ module.exports = function calc(gd, trace) {
         trace._input.xbins = trace.xbins;
     }
     if(trace.autobiny || !('ybins' in trace)) {
-        trace.ybins = Plotly.Axes.autoBin(y,ya,trace.nbinsy,'2d');
+        trace.ybins = Axes.autoBin(y,ya,trace.nbinsy,'2d');
         if(trace.type==='histogram2dcontour') {
             trace.ybins.start -= trace.ybins.size;
             trace.ybins.end += trace.ybins.size;
@@ -94,10 +94,10 @@ module.exports = function calc(gd, trace) {
     // decrease end a little in case of rounding errors
     var binspec = trace.xbins,
         binend = binspec.end +
-            (binspec.start - Plotly.Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
+            (binspec.start - Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
 
     for(i=binspec.start; i<binend;
-            i=Plotly.Axes.tickIncrement(i,binspec.size)) {
+            i=Axes.tickIncrement(i,binspec.size)) {
         onecol.push(sizeinit);
         if(Array.isArray(xbins)) xbins.push(i);
         if(doavg) zerocol.push(0);
@@ -111,10 +111,10 @@ module.exports = function calc(gd, trace) {
 
     binspec = trace.ybins;
     binend = binspec.end +
-        (binspec.start - Plotly.Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
+        (binspec.start - Axes.tickIncrement(binspec.start, binspec.size)) / 1e6;
 
     for(i=binspec.start; i<binend;
-            i=Plotly.Axes.tickIncrement(i,binspec.size)) {
+            i=Axes.tickIncrement(i,binspec.size)) {
         z.push(onecol.concat());
         if(Array.isArray(ybins)) ybins.push(i);
         if(doavg) counts.push(zerocol.concat());
diff --git a/src/traces/mesh3d/defaults.js b/src/traces/mesh3d/defaults.js
index 8a0ff964c6d..36c09511e6d 100644
--- a/src/traces/mesh3d/defaults.js
+++ b/src/traces/mesh3d/defaults.js
@@ -9,8 +9,8 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var colorbarDefaults = require('../../components/colorbar/defaults');
 var attributes = require('./attributes');
 
 
@@ -84,6 +84,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     if(traceOut.showscale) {
-        Plotly.Colorbar.supplyDefaults(traceIn, traceOut, layout);
+        colorbarDefaults(traceIn, traceOut, layout);
     }
 };
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
index 7d5dd989770..7013cb29c5b 100644
--- a/src/traces/pie/plot.js
+++ b/src/traces/pie/plot.js
@@ -10,8 +10,11 @@
 
 var d3 = require('d3');
 
-var Plotly = require('../../plotly');
+var Fx = require('../../plots/cartesian/graph_interact');
 var Color = require('../../components/color');
+var Drawing = require('../../components/drawing');
+var svgTextUtils = require('../../lib/svg_text_utils');
+
 var helpers = require('./helpers');
 
 module.exports = function plot(gd, cdpie) {
@@ -108,7 +111,7 @@ module.exports = function plot(gd, cdpie) {
                     if(hoverinfo.indexOf('value') !== -1) thisText.push(helpers.formatPieValue(pt.v));
                     if(hoverinfo.indexOf('percent') !== -1) thisText.push(helpers.formatPiePercent(pt.v / cd0.vTotal));
 
-                    Plotly.Fx.loneHover({
+                    Fx.loneHover({
                         x0: hoverCenterX - rInscribed * cd0.r,
                         x1: hoverCenterX + rInscribed * cd0.r,
                         y: hoverCenterY,
@@ -121,14 +124,14 @@ module.exports = function plot(gd, cdpie) {
                         outerContainer: fullLayout2._paper.node()
                     });
 
-                    Plotly.Fx.hover(gd, evt, 'pie');
+                    Fx.hover(gd, evt, 'pie');
 
                     hasHoverData = true;
                 }
 
                 function handleMouseOut() {
                     if(hasHoverData) {
-                        Plotly.Fx.loneUnhover(fullLayout._hoverlayer.node());
+                        Fx.loneUnhover(fullLayout._hoverlayer.node());
                         hasHoverData = false;
                     }
                 }
@@ -136,7 +139,7 @@ module.exports = function plot(gd, cdpie) {
                 function handleClick() {
                     gd._hoverdata = [pt];
                     gd._hoverdata.trace = cd.trace;
-                    Plotly.Fx.click(gd, { target: true });
+                    Fx.click(gd, { target: true });
                 }
 
                 slicePath.enter().append('path')
@@ -229,14 +232,14 @@ module.exports = function plot(gd, cdpie) {
                             x: 0,
                             y: 0
                         })
-                        .call(Plotly.Drawing.font, textPosition === 'outside' ?
+                        .call(Drawing.font, textPosition === 'outside' ?
                             trace.outsidetextfont : trace.insidetextfont)
-                        .call(Plotly.util.convertToTspans);
+                        .call(svgTextUtils.convertToTspans);
                     sliceText.selectAll('tspan.line').attr({x: 0, y: 0});
 
                     // position the text relative to the slice
                     // TODO: so far this only accounts for flat
-                    var textBB = Plotly.Drawing.bBox(sliceText.node()),
+                    var textBB = Drawing.bBox(sliceText.node()),
                         transform;
 
                     if(textPosition === 'outside') {
@@ -244,11 +247,11 @@ module.exports = function plot(gd, cdpie) {
                     } else {
                         transform = transformInsideText(textBB, pt, cd0);
                         if(textPosition === 'auto' && transform.scale < 1) {
-                            sliceText.call(Plotly.Drawing.font, trace.outsidetextfont);
+                            sliceText.call(Drawing.font, trace.outsidetextfont);
                             if(trace.outsidetextfont.family !== trace.insidetextfont.family ||
                                     trace.outsidetextfont.size !== trace.insidetextfont.size) {
                                 sliceText.attr({'data-bb': ''});
-                                textBB = Plotly.Drawing.bBox(sliceText.node());
+                                textBB = Drawing.bBox(sliceText.node());
                             }
                             transform = transformOutsideText(textBB, pt);
                         }
diff --git a/src/traces/scatter/colorbar.js b/src/traces/scatter/colorbar.js
index 03237f1f17d..411d7a6509c 100644
--- a/src/traces/scatter/colorbar.js
+++ b/src/traces/scatter/colorbar.js
@@ -12,8 +12,8 @@
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
-var Plotly = require('../../plotly');
 var Lib = require('../../lib');
+var Plots = require('../../plots/plots');
 var getColorscale = require('../../components/colorscale/get_scale');
 var drawColorbar = require('../../components/colorbar/draw');
 
@@ -29,7 +29,7 @@ module.exports = function colorbar(gd, cd) {
     // TODO make Plotly[module].colorbar support multiple colorbar per trace
 
     if((marker === undefined) || !marker.showscale){
-        Plotly.Plots.autoMargin(gd, cbId);
+        Plots.autoMargin(gd, cbId);
         return;
     }
 
@@ -38,8 +38,8 @@ module.exports = function colorbar(gd, cd) {
         cmin = marker.cmin,
         cmax = marker.cmax;
 
-    if(!isNumeric(cmin)) cmin = Plotly.Lib.aggNums(Math.min, null, vals);
-    if(!isNumeric(cmax)) cmax = Plotly.Lib.aggNums(Math.max, null, vals);
+    if(!isNumeric(cmin)) cmin = Lib.aggNums(Math.min, null, vals);
+    if(!isNumeric(cmax)) cmax = Lib.aggNums(Math.max, null, vals);
 
     var cb = cd[0].t.cb = drawColorbar(gd, cbId);
 
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js
index 892841c76a4..a3cf21ed8c1 100644
--- a/src/traces/scattergl/convert.js
+++ b/src/traces/scattergl/convert.js
@@ -9,8 +9,6 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
-
 var createScatter = require('gl-scatter2d');
 var createFancyScatter = require('gl-scatter2d-fancy');
 var createLine = require('gl-line2d');
@@ -18,6 +16,7 @@ var createError = require('gl-error2d');
 var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
+var Axes = require('../../plots/cartesian/axes');
 var ErrorBars = require('../../components/errorbars');
 var str2RGBArray = require('../../lib/str2rgbarray');
 var formatColor = require('../../lib/gl_format_color');
@@ -544,8 +543,8 @@ proto.expandAxesFancy = function(x, y, ppad) {
     var scene = this.scene,
         expandOpts = { padded: true, ppad: ppad };
 
-    Plotly.Axes.expand(scene.xaxis, x, expandOpts);
-    Plotly.Axes.expand(scene.yaxis, y, expandOpts);
+    Axes.expand(scene.xaxis, x, expandOpts);
+    Axes.expand(scene.yaxis, y, expandOpts);
 };
 
 proto.dispose = function() {
diff --git a/test/jasmine/tests/choropleth_test.js b/test/jasmine/tests/choropleth_test.js
index ffaf31570bc..75e03d4533d 100644
--- a/test/jasmine/tests/choropleth_test.js
+++ b/test/jasmine/tests/choropleth_test.js
@@ -1,5 +1,5 @@
-var Plotly = require('@src/plotly');
 var Choropleth = require('@src/traces/choropleth');
+var Plots = require('@src/plots/plots');
 
 
 describe('Test choropleth', function() {
@@ -11,7 +11,7 @@ describe('Test choropleth', function() {
 
         var defaultColor = '#444',
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             };
 
         beforeEach(function() {
diff --git a/test/jasmine/tests/color_test.js b/test/jasmine/tests/color_test.js
index 816e85767ac..3b67c8ea3b7 100644
--- a/test/jasmine/tests/color_test.js
+++ b/test/jasmine/tests/color_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Color = require('@src/components/color');
 
 
 describe('Test color:', function() {
@@ -15,7 +15,7 @@ describe('Test color:', function() {
                 rgbacolor: 'rgba(51, 102, 153, 0.8)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -51,7 +51,7 @@ describe('Test color:', function() {
                 ]
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -70,7 +70,7 @@ describe('Test color:', function() {
                 fractionrgbacolor: 'rgba(0, 102, 204, 1)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -86,7 +86,7 @@ describe('Test color:', function() {
                 rgbacolor: 'rgba(51, 102, 153, 0.8)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -102,7 +102,7 @@ describe('Test color:', function() {
                 rgba2color: 'rgba(26, 51, 128, 1)'
             };
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -117,7 +117,7 @@ describe('Test color:', function() {
             var expectedContainer = {};
             Object.keys(container).forEach(function(k) { expectedContainer[k] = container[k]; });
 
-            Plotly.Color.clean(container);
+            Color.clean(container);
             expect(container).toEqual(expectedContainer);
         });
 
@@ -125,7 +125,7 @@ describe('Test color:', function() {
             var container1 = null;
             var expectedContainer1 = null;
 
-            Plotly.Color.clean(container1);
+            Color.clean(container1);
             expect(container1).toEqual(expectedContainer1);
 
             var container2 = {
@@ -141,7 +141,7 @@ describe('Test color:', function() {
                 anarray: [null, {color: 'rgb(0.1, 0.1, 0.1)'}]
             };
 
-            Plotly.Color.clean(container2);
+            Color.clean(container2);
             expect(container2).toEqual(expectedContainer2);
         });
     });
diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
index e5af0a26c70..a53849a2dbe 100644
--- a/test/jasmine/tests/colorscale_test.js
+++ b/test/jasmine/tests/colorscale_test.js
@@ -1,5 +1,6 @@
-var Plotly = require('@src/plotly');
 var Colorscale = require('@src/components/colorscale');
+var Lib = require('@src/lib');
+var Plots = require('@src/plots/plots');
 var Heatmap = require('@src/traces/heatmap');
 var Scatter = require('@src/traces/scatter');
 
@@ -187,13 +188,13 @@ describe('Test colorscale:', function() {
     describe('handleDefaults (heatmap-like version)', function() {
         var handleDefaults = Colorscale.handleDefaults,
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             },
             opts = {prefix: '', cLetter: 'z'};
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Heatmap.attributes, attr, dflt);
+            return Lib.coerce(traceIn, traceOut, Heatmap.attributes, attr, dflt);
         }
 
         beforeEach(function() {
@@ -257,13 +258,13 @@ describe('Test colorscale:', function() {
     describe('handleDefaults (scatter-like version)', function() {
         var handleDefaults = Colorscale.handleDefaults,
             layout = {
-                font: Plotly.Plots.layoutAttributes.font
+                font: Plots.layoutAttributes.font
             },
             opts = {prefix: 'marker.', cLetter: 'c'};
         var traceIn, traceOut;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(traceIn, traceOut, Scatter.attributes, attr, dflt);
+            return Lib.coerce(traceIn, traceOut, Scatter.attributes, attr, dflt);
         }
 
         beforeEach(function() {
diff --git a/test/jasmine/tests/config_test.js b/test/jasmine/tests/config_test.js
index a8abcd1545c..b2d3e9d8d1b 100644
--- a/test/jasmine/tests/config_test.js
+++ b/test/jasmine/tests/config_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 
@@ -32,7 +32,6 @@ describe('config argument', function() {
 
             var link = document.getElementsByClassName('js-plot-link-container')[0];
 
-            console.log(link);
             expect(link.textContent).toBe('Edit chart »');
 
             var bBox = link.getBoundingClientRect();
diff --git a/test/jasmine/tests/is_plain_object_test.js b/test/jasmine/tests/is_plain_object_test.js
index 5ce1e634da9..1a0058b7eb3 100644
--- a/test/jasmine/tests/is_plain_object_test.js
+++ b/test/jasmine/tests/is_plain_object_test.js
@@ -1,9 +1,9 @@
-var Plotly = require('@src/plotly');
+var Lib = require('@src/lib');
 
 describe('isPlainObject', function() {
     'use strict';
 
-    var isPlainObject = Plotly.Lib.isPlainObject;
+    var isPlainObject = Lib.isPlainObject;
 
     function A() {}
 
diff --git a/test/jasmine/tests/legend_test.js b/test/jasmine/tests/legend_test.js
index a9514fbfc87..8de626b6c83 100644
--- a/test/jasmine/tests/legend_test.js
+++ b/test/jasmine/tests/legend_test.js
@@ -1,10 +1,11 @@
-var Plotly = require('@src/plotly');
+var Legend = require('@src/components/legend');
+var Plots = require('@src/plots/plots');
 
 describe('Test legend:', function() {
     'use strict';
 
     describe('supplyLayoutDefaults', function() {
-        var supplyLayoutDefaults = Plotly.Legend.supplyLayoutDefaults;
+        var supplyLayoutDefaults = Legend.supplyLayoutDefaults;
 
         var layoutIn, layoutOut, fullData;
 
@@ -13,8 +14,8 @@ describe('Test legend:', function() {
                 showlegend: true
             };
             layoutOut = {
-                font: Plotly.Plots.layoutAttributes.font,
-                bg_color: Plotly.Plots.layoutAttributes.bg_color
+                font: Plots.layoutAttributes.font,
+                bg_color: Plots.layoutAttributes.bg_color
             };
         });
 
@@ -62,7 +63,7 @@ describe('Test legend:', function() {
     });
 
     describe('getLegendData', function() {
-        var getLegendData = Plotly.Legend.getLegendData;
+        var getLegendData = Legend.getLegendData;
 
         var calcdata, opts, legendData, expected;
 
diff --git a/test/jasmine/tests/lib_test.js b/test/jasmine/tests/lib_test.js
index d5bb2c3b983..f51385bf608 100644
--- a/test/jasmine/tests/lib_test.js
+++ b/test/jasmine/tests/lib_test.js
@@ -1,36 +1,38 @@
-var Plotly = require('@src/plotly');
+var Lib = require('@src/lib');
+var Plots = require('@src/plots/plots');
+
 
 describe('Test lib.js:', function() {
     'use strict';
 
     describe('parseDate() should', function() {
         it('return false on bad (number) input:', function() {
-            expect(Plotly.Lib.parseDate(0)).toBe(false);
+            expect(Lib.parseDate(0)).toBe(false);
         });
         it('return false on bad (string) input:', function() {
-            expect(Plotly.Lib.parseDate('toto')).toBe(false);
+            expect(Lib.parseDate('toto')).toBe(false);
         });
         it('work with yyyy-mm-dd string input:', function() {
             var input = '2014-12-01',
-                res = Plotly.Lib.parseDate(input),
+                res = Lib.parseDate(input),
                 res0 = new Date(2014, 11, 1);
             expect(res.getTime()).toEqual(res0.getTime());
         });
         it('work with mm/dd/yyyy string input:', function() {
             var input = '12/01/2014',
-                res = Plotly.Lib.parseDate(input),
+                res = Lib.parseDate(input),
                 res0 = new Date(2014, 11, 1);
             expect(res.getTime()).toEqual(res0.getTime());
         });
         it('work with yyyy-mm-dd HH:MM:SS.sss string input:', function() {
             var input = '2014-12-01 09:50:05.124',
-                res = Plotly.Lib.parseDate(input),
+                res = Lib.parseDate(input),
                 res0 = new Date(2014, 11, 1, 9, 50, 5, 124);
             expect(res.getTime()).toEqual(res0.getTime());
         });
         it('work with mm/dd/yyyy HH:MM:SS string input:', function() {
             var input = '2014-12-01 09:50:05',
-                res = Plotly.Lib.parseDate(input),
+                res = Lib.parseDate(input),
                 res0 = new Date(2014, 11, 1, 9, 50, 5);
             expect(res.getTime()).toEqual(res0.getTime());
         });
@@ -39,32 +41,32 @@ describe('Test lib.js:', function() {
     describe('interp() should', function() {
         it('return 1.75 as Q1 of [1, 2, 3, 4, 5]:', function() {
             var input = [1, 2, 3, 4, 5],
-                res = Plotly.Lib.interp(input, 0.25),
+                res = Lib.interp(input, 0.25),
                 res0 = 1.75;
             expect(res).toEqual(res0);
         });
         it('return 4.25 as Q3 of [1, 2, 3, 4, 5]:', function() {
             var input = [1, 2, 3, 4, 5],
-                res = Plotly.Lib.interp(input, 0.75),
+                res = Lib.interp(input, 0.75),
                 res0 = 4.25;
             expect(res).toEqual(res0);
         });
         it('error if second input argument is a string:', function() {
             var input = [1, 2, 3, 4, 5];
             expect(function() {
-                Plotly.Lib.interp(input, 'apple');
+                Lib.interp(input, 'apple');
             }).toThrow('n should be a finite number');
         });
         it('error if second input argument is a date:', function() {
             var in1 = [1, 2, 3, 4, 5],
                 in2 = new Date(2014, 11, 1);
             expect(function() {
-                Plotly.Lib.interp(in1, in2);
+                Lib.interp(in1, in2);
             }).toThrow('n should be a finite number');
         });
         it('return the right boundary on input [-Inf, Inf]:', function() {
             var input = [-Infinity, Infinity],
-                res = Plotly.Lib.interp(input, 1),
+                res = Lib.interp(input, 1),
                 res0 = Infinity;
             expect(res).toEqual(res0);
         });
@@ -83,12 +85,12 @@ describe('Test lib.js:', function() {
                     [undefined, 4, undefined, undefined]
                 ];
 
-            expect(Plotly.Lib.transposeRagged(input)).toEqual(output);
+            expect(Lib.transposeRagged(input)).toEqual(output);
         });
     });
 
     describe('dot()', function() {
-        var dot = Plotly.Lib.dot;
+        var dot = Lib.dot;
 
         it('should return null for empty or unequal-length inputs', function() {
             expect(dot([], [])).toBeNull();
@@ -111,7 +113,7 @@ describe('Test lib.js:', function() {
     });
 
     describe('aggNums()', function() {
-        var aggNums = Plotly.Lib.aggNums;
+        var aggNums = Lib.aggNums;
 
         function summation(a, b) { return a + b; }
 
@@ -133,17 +135,17 @@ describe('Test lib.js:', function() {
     describe('mean() should', function() {
         it('toss out non-numerics (strings):', function() {
             var input = [1, 2, 'apple', 'orange'],
-                res = Plotly.Lib.mean(input);
+                res = Lib.mean(input);
             expect(res).toEqual(1.5);
         });
         it('toss out non-numerics (NaN):', function() {
             var input = [1, 2, NaN],
-                res = Plotly.Lib.mean(input);
+                res = Lib.mean(input);
             expect(res).toEqual(1.5);
         });
         it('evaluate numbers which are passed around as text strings:', function() {
             var input = ['1', '2'],
-                res = Plotly.Lib.mean(input);
+                res = Lib.mean(input);
             expect(res).toEqual(1.5);
         });
     });
@@ -151,22 +153,22 @@ describe('Test lib.js:', function() {
     describe('variance() should', function() {
         it('return 0 on input [2, 2, 2, 2, 2]:', function() {
             var input = [2, 2, 2, 2],
-                res = Plotly.Lib.variance(input);
+                res = Lib.variance(input);
             expect(res).toEqual(0);
         });
         it('return 2/3 on input [-1, 0, 1]:', function() {
             var input = [-1, 0, 1],
-                res = Plotly.Lib.variance(input);
+                res = Lib.variance(input);
             expect(res).toEqual(2/3);
         });
         it('toss out non-numerics (strings):', function() {
             var input = [1, 2, 'apple', 'orange'],
-                res = Plotly.Lib.variance(input);
+                res = Lib.variance(input);
             expect(res).toEqual(0.25);
         });
         it('toss out non-numerics (NaN):', function() {
             var input = [1, 2, NaN],
-                res = Plotly.Lib.variance(input);
+                res = Lib.variance(input);
             expect(res).toEqual(0.25);
         });
     });
@@ -174,22 +176,22 @@ describe('Test lib.js:', function() {
     describe('stdev() should', function() {
         it('return 0 on input [2, 2, 2, 2, 2]:', function() {
             var input = [2, 2, 2, 2],
-                res = Plotly.Lib.stdev(input);
+                res = Lib.stdev(input);
             expect(res).toEqual(0);
         });
         it('return sqrt(2/3) on input [-1, 0, 1]:', function() {
             var input = [-1, 0, 1],
-                res = Plotly.Lib.stdev(input);
+                res = Lib.stdev(input);
             expect(res).toEqual(Math.sqrt(2/3));
         });
         it('toss out non-numerics (strings):', function() {
             var input = [1, 2, 'apple', 'orange'],
-                res = Plotly.Lib.stdev(input);
+                res = Lib.stdev(input);
             expect(res).toEqual(0.5);
         });
         it('toss out non-numerics (NaN):', function() {
             var input = [1, 2, NaN],
-                res = Plotly.Lib.stdev(input);
+                res = Lib.stdev(input);
             expect(res).toEqual(0.5);
         });
     });
@@ -197,19 +199,19 @@ describe('Test lib.js:', function() {
     describe('smooth()', function() {
         it('should not alter the input for FWHM < 1.5', function() {
             var input = [1, 2, 1, 2, 1],
-                output = Plotly.Lib.smooth(input.slice(), 1.49);
+                output = Lib.smooth(input.slice(), 1.49);
 
             expect(output).toEqual(input);
 
-            output = Plotly.Lib.smooth(input.slice(), 'like butter');
+            output = Lib.smooth(input.slice(), 'like butter');
 
             expect(output).toEqual(input);
         });
 
         it('should preserve the length and integral even with multiple bounces', function() {
             var input = [1, 2, 4, 8, 16, 8, 10, 12],
-                output2 = Plotly.Lib.smooth(input.slice(), 2),
-                output30 = Plotly.Lib.smooth(input.slice(), 30),
+                output2 = Lib.smooth(input.slice(), 2),
+                output30 = Lib.smooth(input.slice(), 30),
                 sumIn = 0,
                 sum2 = 0,
                 sum30 = 0;
@@ -228,8 +230,8 @@ describe('Test lib.js:', function() {
 
         it('should use a hann window and bounce', function() {
             var input = [0, 0, 0, 7, 0, 0, 0],
-                out4 = Plotly.Lib.smooth(input, 4),
-                out7 = Plotly.Lib.smooth(input, 7),
+                out4 = Lib.smooth(input, 4),
+                out7 = Lib.smooth(input, 7),
                 expected4 = [
                     0.2562815664617711, 0.875, 1.4937184335382292, 1.75,
                     1.493718433538229, 0.875, 0.25628156646177086
@@ -245,7 +247,7 @@ describe('Test lib.js:', function() {
     });
 
     describe('nestedProperty', function() {
-        var np = Plotly.Lib.nestedProperty;
+        var np = Lib.nestedProperty;
 
         it('should access simple objects', function() {
             var obj = {a: 'b', c: 'd'},
@@ -434,7 +436,7 @@ describe('Test lib.js:', function() {
     });
 
     describe('coerce', function() {
-        var coerce = Plotly.Lib.coerce,
+        var coerce = Lib.coerce,
             out;
 
         // TODO: I tested font and string because I changed them, but all the other types need tests still
@@ -495,7 +497,7 @@ describe('Test lib.js:', function() {
         });
 
         describe('coerce2', function() {
-            var coerce2 = Plotly.Lib.coerce2;
+            var coerce2 = Lib.coerce2;
 
             it('should set a value and return the value it sets when user input is valid', function() {
                 var colVal = 'red',
@@ -589,9 +591,9 @@ describe('Test lib.js:', function() {
     });
 
     describe('coerceFont', function() {
-        var fontAttrs = Plotly.Plots.fontAttrs,
-            extendFlat = Plotly.Lib.extendFlat,
-            coerceFont = Plotly.Lib.coerceFont;
+        var fontAttrs = Plots.fontAttrs,
+            extendFlat = Lib.extendFlat,
+            coerceFont = Lib.coerceFont;
 
         var defaultFont = {
             family: '"Open sans", verdana, arial, sans-serif, DEFAULT',
@@ -611,7 +613,7 @@ describe('Test lib.js:', function() {
         var containerIn;
 
         function coerce(attr, dflt) {
-            return Plotly.Lib.coerce(containerIn, {}, attributes, attr, dflt);
+            return Lib.coerce(containerIn, {}, attributes, attr, dflt);
         }
 
         it('should insert the full default if no or empty input', function() {
@@ -666,7 +668,7 @@ describe('Test lib.js:', function() {
 
     describe('init2dArray', function() {
         it('should initialize a 2d array with the correct dimenstions', function() {
-            var array = Plotly.Lib.init2dArray(4, 5);
+            var array = Lib.init2dArray(4, 5);
             expect(array.length).toEqual(4);
             expect(array[0].length).toEqual(5);
             expect(array[3].length).toEqual(5);
diff --git a/test/jasmine/tests/plot_promise_test.js b/test/jasmine/tests/plot_promise_test.js
index 56b822b3915..1cd4348077f 100644
--- a/test/jasmine/tests/plot_promise_test.js
+++ b/test/jasmine/tests/plot_promise_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
 var Events = require('@src/lib/events');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
diff --git a/test/jasmine/tests/plots_test.js b/test/jasmine/tests/plots_test.js
index a3c4cb7ae4a..ecd24f4fc6c 100644
--- a/test/jasmine/tests/plots_test.js
+++ b/test/jasmine/tests/plots_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
 var Plots = require('@src/plots/plots');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
diff --git a/test/jasmine/tests/plotschema_test.js b/test/jasmine/tests/plotschema_test.js
index 570ecaefd35..9e7a9fcfc0d 100644
--- a/test/jasmine/tests/plotschema_test.js
+++ b/test/jasmine/tests/plotschema_test.js
@@ -1,4 +1,5 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
+var Lib = require('@src/lib');
 
 describe('plot schema', function() {
     'use strict';
@@ -7,7 +8,7 @@ describe('plot schema', function() {
         valObjects = plotSchema.defs.valObjects;
 
     var isValObject = Plotly.PlotSchema.isValObject,
-        isPlainObject = Plotly.Lib.isPlainObject;
+        isPlainObject = Lib.isPlainObject;
 
     var VALTYPES = Object.keys(valObjects),
         ROLES = ['info', 'style', 'data'];
@@ -95,7 +96,7 @@ describe('plot schema', function() {
         // check if the subplot objects have '_isSubplotObj'
         astrs.forEach(function(astr) {
             expect(
-                Plotly.Lib.nestedProperty(
+                Lib.nestedProperty(
                     plotSchema.layout.layoutAttributes,
                     astr + '.' + IS_SUBPLOT_OBJ
                 ).get()
@@ -117,7 +118,7 @@ describe('plot schema', function() {
         astrs.forEach(function(astr) {
             expect(
                 isPlainObject(
-                    Plotly.Lib.nestedProperty(
+                    Lib.nestedProperty(
                         plotSchema.layout.layoutAttributes, astr
                     ).get().items
                 )
diff --git a/test/jasmine/tests/register_test.js b/test/jasmine/tests/register_test.js
index c2f59013d01..80a2657f3e4 100644
--- a/test/jasmine/tests/register_test.js
+++ b/test/jasmine/tests/register_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Plotly = require('@lib/index');
 
 describe('the register function', function() {
 
diff --git a/test/jasmine/tests/search_test.js b/test/jasmine/tests/search_test.js
index da9bd4c81b6..6b6b122c117 100644
--- a/test/jasmine/tests/search_test.js
+++ b/test/jasmine/tests/search_test.js
@@ -1,36 +1,36 @@
-var Plotly = require('@src/plotly');
+var Lib = require('@src/lib');
 
 describe('Test search.js:', function() {
     'use strict';
 
     describe('findBin', function() {
         it('should work on ascending arrays', function() {
-            expect(Plotly.Lib.findBin(-10000, [0, 1, 3])).toBe(-1);
-            expect(Plotly.Lib.findBin(0.5, [0, 1, 3])).toBe(0);
-            expect(Plotly.Lib.findBin(2, [0, 1, 3])).toBe(1);
-            expect(Plotly.Lib.findBin(10000, [0, 1, 3])).toBe(2);
+            expect(Lib.findBin(-10000, [0, 1, 3])).toBe(-1);
+            expect(Lib.findBin(0.5, [0, 1, 3])).toBe(0);
+            expect(Lib.findBin(2, [0, 1, 3])).toBe(1);
+            expect(Lib.findBin(10000, [0, 1, 3])).toBe(2);
             // default: linelow falsey, so the line is in the higher bin
-            expect(Plotly.Lib.findBin(1, [0, 1, 3])).toBe(1);
+            expect(Lib.findBin(1, [0, 1, 3])).toBe(1);
             // linelow truthy, so the line is in the lower bin
-            expect(Plotly.Lib.findBin(1, [0, 1, 3], true)).toBe(0);
+            expect(Lib.findBin(1, [0, 1, 3], true)).toBe(0);
         });
 
         it('should work on decending arrays', function() {
-            expect(Plotly.Lib.findBin(-10000, [3, 1, 0])).toBe(2);
-            expect(Plotly.Lib.findBin(0.5, [3, 1, 0])).toBe(1);
-            expect(Plotly.Lib.findBin(2, [3, 1, 0])).toBe(0);
-            expect(Plotly.Lib.findBin(10000, [3, 1, 0])).toBe(-1);
+            expect(Lib.findBin(-10000, [3, 1, 0])).toBe(2);
+            expect(Lib.findBin(0.5, [3, 1, 0])).toBe(1);
+            expect(Lib.findBin(2, [3, 1, 0])).toBe(0);
+            expect(Lib.findBin(10000, [3, 1, 0])).toBe(-1);
 
-            expect(Plotly.Lib.findBin(1, [3, 1, 0])).toBe(0);
-            expect(Plotly.Lib.findBin(1, [3, 1, 0], true)).toBe(1);
+            expect(Lib.findBin(1, [3, 1, 0])).toBe(0);
+            expect(Lib.findBin(1, [3, 1, 0], true)).toBe(1);
         });
 
         it('should treat a length-1 array as ascending', function() {
-            expect(Plotly.Lib.findBin(-1, [0])).toBe(-1);
-            expect(Plotly.Lib.findBin(1, [0])).toBe(0);
+            expect(Lib.findBin(-1, [0])).toBe(-1);
+            expect(Lib.findBin(1, [0])).toBe(0);
 
-            expect(Plotly.Lib.findBin(0, [0])).toBe(0);
-            expect(Plotly.Lib.findBin(0, [0], true)).toBe(-1);
+            expect(Lib.findBin(0, [0])).toBe(0);
+            expect(Lib.findBin(0, [0], true)).toBe(-1);
         });
         // TODO: didn't test bins as objects {start, stop, size}
     });
diff --git a/test/jasmine/tests/snapshot_clone_test.js b/test/jasmine/tests/snapshot_clone_test.js
index 76941275723..3770c539666 100644
--- a/test/jasmine/tests/snapshot_clone_test.js
+++ b/test/jasmine/tests/snapshot_clone_test.js
@@ -1,4 +1,4 @@
-var Plotly = require('@src/plotly');
+var Snapshot = require('@src/snapshot');
 
 describe('Test Snapshot.clone', function() {
     'use strict';
@@ -76,7 +76,7 @@ describe('Test Snapshot.clone', function() {
                 setBackground: 'opaque'
             };
 
-            var themeTile = Plotly.Snapshot.clone(dummyGraphObj, themeOptions);
+            var themeTile = Snapshot.clone(dummyGraphObj, themeOptions);
             expect(themeTile.layout.height).toEqual(THEMETILE_DEFAULT_LAYOUT.height);
             expect(themeTile.layout.width).toEqual(THEMETILE_DEFAULT_LAYOUT.width);
             expect(themeTile.td.defaultLayout).toEqual(THEMETILE_DEFAULT_LAYOUT);
@@ -101,7 +101,7 @@ describe('Test Snapshot.clone', function() {
                 'annotations': []
             };
 
-            var thumbTile = Plotly.Snapshot.clone(dummyGraphObj, thumbnailOptions);
+            var thumbTile = Snapshot.clone(dummyGraphObj, thumbnailOptions);
             expect(thumbTile.layout.hidesources).toEqual(THUMBNAIL_DEFAULT_LAYOUT.hidesources);
             expect(thumbTile.layout.showlegend).toEqual(THUMBNAIL_DEFAULT_LAYOUT.showlegend);
             expect(thumbTile.layout.borderwidth).toEqual(THUMBNAIL_DEFAULT_LAYOUT.borderwidth);
@@ -115,7 +115,7 @@ describe('Test Snapshot.clone', function() {
                 width: 888
             };
 
-            var customTile = Plotly.Snapshot.clone(dummyGraphObj, customOptions);
+            var customTile = Snapshot.clone(dummyGraphObj, customOptions);
             expect(customTile.layout.height).toEqual(customOptions.height);
             expect(customTile.layout.width).toEqual(customOptions.width);
         });
@@ -125,7 +125,7 @@ describe('Test Snapshot.clone', function() {
                 tileClass: 'notarealclass'
             };
 
-            var vanillaPlotTile = Plotly.Snapshot.clone(dummyGraphObj, vanillaOptions);
+            var vanillaPlotTile = Snapshot.clone(dummyGraphObj, vanillaOptions);
             expect(vanillaPlotTile.data[0].x).toEqual(data[0].x);
             expect(vanillaPlotTile.layout).toEqual(layout);
             expect(vanillaPlotTile.layout.height).toEqual(layout.height);
@@ -133,12 +133,12 @@ describe('Test Snapshot.clone', function() {
         });
 
         it('should set the background parameter appropriately', function() {
-            var pt = Plotly.Snapshot.clone(dummyGraphObj, {
+            var pt = Snapshot.clone(dummyGraphObj, {
                 setBackground: 'transparent'
             });
             expect(pt.config.setBackground).not.toBeDefined();
 
-            pt = Plotly.Snapshot.clone(dummyGraphObj, {
+            pt = Snapshot.clone(dummyGraphObj, {
                 setBackground: 'blue'
             });
             expect(pt.config.setBackground).toEqual('blue');